blur header height and line category fix

Fix token images not being displayed (#18288 )
Signed-off-by: Brian Sztamfater <brian@status.im>
2023-12-28 13:27:14 +01:00 · 2023-12-27 12:43:47 -03:00 · 2023-12-27 19:14:09 +04:00 · 2023-12-27 09:13:29 +05:30 · 2023-12-27 00:50:01 +02:00 · 2023-12-26 08:12:20 -08:00
438 changed files with 4845 additions and 7295 deletions
@@ -1,2 +1,8 @@
-{:hooks   {:analyze-call {utils.i18n/label utils.i18n/label}}
+{:hooks
+ {:analyze-call
+  {utils.i18n/label                                     utils.i18n/label
+   test-helpers.component/get-all-by-translation-text   utils.i18n/label
+   test-helpers.component/get-by-translation-text       utils.i18n/label
+   test-helpers.component/query-all-by-translation-text utils.i18n/label
+   test-helpers.component/query-by-translation-text     utils.i18n/label}}
 :linters {:status-im.linter/invalid-translation-keyword {:level :error}}}
@@ -18,13 +18,17 @@
             ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-bl
             :respect-bl

-             ;; hang multiline left-hand-thing 
+             ;; hang multiline left-hand-thing
             ;; https://github.com/kkinnear/zprint/issues/273
             :multi-lhs-hang]
 :fn-map
 {"reg-sub"         :arg1-pair
  "h/describe"      :arg1-body
+  "h/describe-skip" :arg1-body
+  "h/describe-only" :arg1-body
  "h/test"          :arg1-body
+  "h/test-skip"     :arg1-body
+  "h/test-only"     :arg1-body
  "global.describe" :arg1-body
  "global.test"     :arg1-body
  "list-comp"       :binding
@@ -283,9 +283,9 @@ run-ios: export TARGET := ios
 run-ios: export IOS_STATUS_GO_TARGETS := iossimulator/amd64
 run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
-	npx react-native run-ios --simulator="$(SIMULATOR)"
+	npx react-native run-ios --simulator="$(SIMULATOR)" | xcbeautify
 else
-	npx react-native run-ios
+	npx react-native run-ios | xcbeautify
 endif

 show-ios-devices: ##@other shows connected ios device and its name
@@ -327,7 +327,7 @@ lint-fix: ##@test Run code style checks and fix issues
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	clojure-lsp --ns-exclude-regex ".*/src/status_im/core\.cljs$$" clean-ns && \
+	clojure-lsp --ns-exclude-regex ".*/src/status_im/core\.cljs|.*/src/test_helpers/component_tests_preload\.cljs$$" clean-ns && \
 	sh scripts/lint/trailing-newline.sh --fix && \
 	node_modules/.bin/prettier --write .

@@ -364,6 +364,7 @@ android-test:
 component-test-watch: export TARGET := clojure
 component-test-watch: export COMPONENT_TEST := true
 component-test-watch: export BABEL_ENV := test
+component-test-watch: export JEST_USE_SILENT_REPORTER := false
 component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	@@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
@@ -373,6 +374,7 @@ component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 component-test: export TARGET := clojure
 component-test: export COMPONENT_TEST := true
 component-test: export BABEL_ENV := test
+component-test: export JEST_USE_SILENT_REPORTER := false
 component-test: ##@test Run component tests once in NodeJS
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
@@ -36,10 +36,10 @@ pipeline {
      steps { script {
        copyArtifacts(
          projectName: "status-mobile/platforms/android-e2e",
-          filter: 'result/*-x86.apk',
+          filter: 'result/*-x86_64.apk',
          selector: specific(env.APK_BUILD_NUMBER),
        )
-        apk_path = "${env.WORKSPACE}/${utils.findFile('result/*-x86.apk')}"
+        apk_path = "${env.WORKSPACE}/${utils.findFile('result/*-x86_64.apk')}"

      } }
    }
@@ -340,7 +340,7 @@ PODS:
    - React
  - react-native-transparent-video (0.1.0):
    - React-Core
-  - react-native-webview (13.3.1):
+  - react-native-webview (13.6.3):
    - React-Core
  - React-NativeModulesApple (0.72.5):
    - React-callinvoker
@@ -838,7 +838,7 @@ SPEC CHECKSUMS:
  react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
  react-native-status-keycard: f1c1227b2d5984c10fb44db68e4bfd2937f31e98
  react-native-transparent-video: e484ad11ace8e5f62516e2c5e15efd3cb4df24b0
-  react-native-webview: c2b70afb1d910cdd8810375aecc6c2894e2ba061
+  react-native-webview: 88293a0f23eca8465c0433c023ec632930e644d0
  React-NativeModulesApple: c6529c637f2e886aab44c48d66cabef2d4fd1138
  React-perflogger: cd8886513f68e1c135a1e79d20575c6489641597
  React-RCTActionSheet: 726d2615ca62a77ce3e2c13d87f65379cdc73498
@@ -1183,6 +1183,11 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
        return pathCombine(absRootDirPath, "keystore");
    }

+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String fleets() {
+        return Statusgo.fleets();
+    }
+
    @ReactMethod(isBlockingSynchronousMethod = true)
    public String backupDisabledDataDir() {
        return this.getNoBackupDirectory();
@@ -981,6 +981,10 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(isAddress:(NSString *)address) {
  return StatusgoIsAddress(address);
 }

+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(fleets) {
+  return StatusgoFleets();
+}
+
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(toChecksumAddress:(NSString *)address) {
  return StatusgoToChecksumAddress(address);
 }
@@ -298,6 +298,7 @@ void _MultiAccountStoreAccount(const FunctionCallbackInfo<Value>& args) {
 	delete c;
 }

+
 void _InitKeystore(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -562,6 +563,17 @@ void _CheckAddressChecksum(const FunctionCallbackInfo<Value>& args) {

 }

+void _Fleets(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+	// Call exported Go function, which returns a C string
+	char *c = Fleets();
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+}
+
+
 void _IsAddress(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -1888,6 +1900,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreDerivedAccounts", _MultiAccountStoreDerivedAccounts);
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
+	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
 	NODE_SET_METHOD(exports, "encodeFunctionCall", _EncodeFunctionCall);
@@ -12,8 +12,7 @@ stdenv.mkDerivation {
    "patchBuildIdPhase"
    "patchKeyChainPhase"
    "patchGlogPhase"
-    "patchJestPhase"
-    "installPhase"    
+    "installPhase"
  ];

  # First symlink all modules as is
@@ -56,13 +55,6 @@ stdenv.mkDerivation {
      '-Wl,--build-id=none'
  '';

-  # Remove when we upgrade jest to 29
-  patchJestPhase = ''
-    substituteInPlace ./node_modules/react-native/jest/setup.js --replace \
-      'jest.now()' \
-      'Date.now'
-  '';
-
  installPhase = ''
    mkdir -p $out
    cp -R node_modules $out/
@@ -35,9 +35,9 @@ let


  envFileName =
-    if androidAbiInclude == "x86"                  then ".env.e2e"
-    else if (elem buildType ["release" "nightly"]) then ".env.${buildType}"
-    else if (elem buildType ["pr" "manual"])       then ".env.jenkins"
+    if (elem androidAbiInclude ["x86" "x86_64" "x86;x86_64"]) then ".env.e2e"
+    else if (elem buildType ["release" "nightly"])            then ".env.${buildType}"
+    else if (elem buildType ["pr" "manual"])                  then ".env.jenkins"
    else ".env";

  # There are only two types of Gradle build targets: pr and release
@@ -21,6 +21,7 @@ in {
      xcodeWrapper watchman procps
      flock # used in nix/scripts/node_modules.sh
      ios-deploy # used in 'make run-ios-device'
+      xcbeautify # used in 'make run-ios'
    ];

    # WARNING: Executes shellHook in reverse order.
@@ -96,4 +96,5 @@ in {
  aapt2 = callPackage ./pkgs/aapt2 { };
  patchMavenSources = callPackage ./pkgs/patch-maven-srcs { };
  goMavenResolver = callPackage ./pkgs/go-maven-resolver { };
+  xcbeautify = callPackage ./pkgs/xcbeautify { };
 }
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, unzip, lib }:
+
+let
+  inherit (lib) getAttr;
+in
+stdenv.mkDerivation rec {
+  pname = "xcbeautify";
+  version = "1.1.1";
+  arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
+
+  src = fetchurl {
+    url = "https://github.com/tuist/xcbeautify/releases/download/${version}/xcbeautify-${version}-${arch}-apple-macosx.zip";
+    sha256 = getAttr arch {
+            arm64 = "sha256-VaZBWZNx5iZxjpsVbKQA4wVsigjlhArDCsQXY/RBDx4=";
+            x86_64 = "sha256-Q1t4nHQu05mPqNRmL0KQukGRAHdkQHM7H24ar0isQTo=";
+        };
+    };
+
+  buildInputs = [ unzip ];
+
+  unpackPhase = ''
+    unzip $src
+  '';
+
+  installPhase = ''
+    install -D xcbeautify $out/bin/xcbeautify
+  '';
+
+  meta = with lib; {
+    description = "A little beautifier tool for xcodebuild";
+    homepage = "https://github.com/tuist/xcbeautify";
+    license = licenses.mit;
+    platforms = platforms.darwin;
+  };
+}
@@ -26,6 +26,7 @@
    "create-react-class": "^15.6.2",
    "emojilib": "^2.4.0",
    "eth-phishing-detect": "^1.2.0",
+    "form-data": "^4.0.0",
    "functional-red-black-tree": "^1.0.1",
    "i18n-js": "^3.3.0",
    "jsc-android": "^250231.0.0",
@@ -48,7 +49,6 @@
    "react-native-image-crop-picker": "0.40.0",
    "react-native-image-resizer": "^1.2.3",
    "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#refs/tags/v0.2.1.status",
-    "react-native-intersection-observer": "^0.2.0",
    "react-native-keychain": "8.1.2",
    "react-native-languages": "^3.0.2",
    "react-native-linear-gradient": "^2.8.0",
@@ -67,7 +67,7 @@
    "react-native-svg": "13.10.0",
    "react-native-touch-id": "^4.4.1",
    "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
-    "react-native-webview": "13.3.1",
+    "react-native-webview": "13.6.3",
    "react-syntax-highlighter": "^15.5.0",
    "rn-emoji-keyboard": "0.7.0",
    "tdigest": "^0.1.1"
@@ -82,18 +82,17 @@
    "@babel/register": "7.0.0",
    "@jest/globals": "^25.1.0",
    "@mapbox/node-pre-gyp": "^1.0.9",
-    "@testing-library/jest-native": "^5.0.0",
-    "@testing-library/react-native": "^11.2.0",
+    "@testing-library/jest-native": "^5.4.3",
+    "@testing-library/react-native": "^12.4.2",
    "@tsconfig/react-native": "^3.0.0",
    "@types/jest": "^28.1.6",
    "@types/react": "^18.0.24",
    "@types/react-test-renderer": "^18.0.0",
    "babel-jest": "^29.7.0",
    "concurrently": "^7.6.0",
-    "jest": "^26.6.3",
-    "jest-circus": "^26.0.0",
-    "jest-environment-node": "^26.6.2",
+    "jest": "^29.7.0",
    "jest-image-snapshot": "^5.1.0",
+    "jest-silent-reporter": "^0.5.0",
    "metro-react-native-babel-preset": "0.76.8",
    "nodemon": "^2.0.16",
    "nyc": "^14.1.1",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jo-mut	7e54c6802d	blur header height and line category fix	2023-12-28 13:27:14 +01:00
Ulises Manuel	107d1a80c9	Fix token images not being displayed (#18288 ) Signed-off-by: Brian Sztamfater <brian@status.im>	2023-12-27 12:43:47 -03:00
Omar Basem	01e8c7e480	Wallet: about tab fixes (#18298 ) * wallet: about tab fixes	2023-12-27 19:14:09 +04:00
Siddarth Kumar	0a1152bcc6	chore: bump `react-native-webview` to `13.6.3` (#18295 ) We need to upgrade `react-native-webview` as a pre-requisite for upgrading `react-native` to `0.73.x` else we face this issue while building iOS : https://github.com/react-native-webview/react-native-webview/issues/3233	2023-12-27 09:13:29 +05:30
Yevheniia Berdnyk	734abc221c	e2e: tests fixes	2023-12-27 00:50:01 +02:00
Ajay Sivan	bec51b7d0e	Add :wallet/accounts-with-customization-color subscription (#18302 )	2023-12-26 08:12:20 -08:00
Icaro Motta	0b4a1545ae	Fix component tests, upgrade Jest & friends, and a few other goodies (#18276 ) Fix all component tests after the latest RN upgrade. Fixes https://github.com/status-im/status-mobile/issues/18157 Closes https://github.com/status-im/status-mobile/pull/18235 Dependency changes - Upgraded Jest: from 26.6.3 to latest 29.7.0. - Upgraded @testing-library/jest-native: from 5.3.0 to latest 5.4.3 - Upgraded @testing-library/react-native: from 11.5.4 to 12.4.2 - Removed explicit dependency on jest-circus, this is now the default test runner. - Removed explicit dependency on jest-environment-node. This is handled by the package manager. - Added jest-silent-reporter at version 0.5.0. ### Why component tests were failing? Many tests were failing because we were using RN Testing Library (RNTL) in an unreliable fashion. With the recent library upgrades, the unreliability was excerbated. Other times, the tests were incorrectly arranging data. ### with-redefs does not work with async code Generally speaking, with-redefs should not be used with async code, assume the worst. The scope of the macro will cease to exist by the time the async code runs. In many tests we were using with-redefs, then calling render, but for some components that use use-effect, JS timers, animations, etc it's unreliable and were the reason for failures. It's easy to reproduce too: ```clojure (defn foo [] :foo) (foo) ;; => :foo (with-redefs [foo (constantly :bar)] (foo)) ;; => :bar (js/setTimeout (fn [] (tap> [:calling-foo (foo)])) 100) ;; Taps [:calling-foo :foo] ;; As you would expect, when running without with-redefs, it prints :foo. ;; So far so good, but whatch what happens with async code: (with-redefs [foo (constantly :bar)] (js/setTimeout (fn [] (tap> [:calling-foo (foo)])) 100)) ;; Taps [:calling-foo :foo] ;; ====> PROBLEM: Taps :foo, not :bar as one might expect ``` ### Not waiting on wait-for When test-helpers.component/wait-for is used, subsequent assertions/etc should be done after the promise returned by wait-for is resolved. But remember to not perform side-effects inside the wait-for callback (check out the docs https://callstack.github.io/react-native-testing-library/docs/api#waitfor). Most, if not all of our usages of wait-for were not waiting. #### Improvement 1 - Silence Jest on demand If you need to re-run component tests frequently, you may want to reduce the output verbosity. By passing JEST_USE_SILENT_REPORTER=true to make component-test or make component-test-watch you will see a lot less noise and be able to focus on what really matters to you. #### Improvement 2 - Selectively focus/disable tests Because of our need to first compile CLJS to JS before running tests via Jest, we couldn't easily skip or focus on specific tests. From this commit onwards, we should never again have to change the list of requires in files core_spec.cljs. Commenting out required namespaces gives a bad DX because it causes constant rebasing issues. #### Improvement 3 - Translations now work as in prod code (but only English) Translations performed by *-by-translation-text can be done now without any workaround under the hood. The query functions are now linted just like i18n/label, which means static translation keywords must be qualified with :t/, which is good for consistency.	2023-12-26 11:58:23 -03:00
Siddarth Kumar	46c5f42fad	chore: add `form-data` package for DIWAI uploads (#18299 )	2023-12-26 16:08:46 +05:30
Yevheniia Berdnyk	5d21b1f5ae	e2e: fix for getting public key	2023-12-24 01:47:16 +02:00
Siddarth Kumar	49c6a44824	chore: update status-go version (#18253 )	2023-12-23 10:08:49 +05:30
flexsurfer	31acb8e9c4	improve profile screen performance (#18281 )	2023-12-22 16:59:12 +01:00
Jamie CapraniandPaul Fitzgerald	eda8c0ccb0	fix(quo): truncation on wallet account card long name (#18259 ) --------- Co-authored-by: Paul Fitzgerald <paulfitz99@gmail.com>	2023-12-22 15:48:57 +00:00
codemaster	7915ba85ab	fix: theming toast component (#17918 )	2023-12-23 01:29:50 +10:00
Yevheniia Berdnyk	1bd6898e1c	apk name updated in e2e nightly jenkins file	2023-12-22 16:18:00 +02:00
Siddarth Kumar	10b97843ce	feat: add `xcbeautify` to iOS shell (#18273 ) I can't remember the number of times I have had to ask developers to run `make run-ios \| xcbeautify` when debugging iOS build failures and they do not have `xcbeautify` installed on their environment. `xcbeautify` helps make `xcodebuild` output more readable and to identify problems quickly. This commit adds `xcbeautify` to iOS shell and to `make run-ios` so that we get readable output by default.	2023-12-22 19:45:59 +05:30
Omar Basem	5eb0baa64d	Wallet: best route UI (#18266 ) * Wallet: best route UI	2023-12-22 09:40:43 +04:00
yqrashawn	a4dc268bc3	feat: spectate community before join (#18070 )	2023-12-22 10:21:10 +08:00
Ulises Manuel	5fa9c0cab6	[#17964 ] emoji screen performance (#18213 ) * Fix `->` style in emoji-picker.data * Make `temp-empty-symbol` component code safer to avoid app crashing * fix `->` style in `emoji-picker.utils` * Pass sheet-animating? ratom to bottom-sheet's content component * Improve emoji picker performance	2023-12-21 15:44:33 -06:00
Omar Basem	4f9544d20c	Wallet: receive screen (#18167 ) * wallet: receive screen	2023-12-21 22:07:27 +04:00
flexsurfer	ad8d537b9c	move status-im from utils (#18249 )	2023-12-21 18:16:59 +01:00
Yevheniia Berdnyk	5ec5838657	e2e: added validation of encoded data in community and profile urls	2023-12-21 19:00:29 +02:00
Jamie Caprani	4c3d1667ca	chore: add outline for transacation-progress page (#18217 )	2023-12-21 15:37:18 +00:00
Anton Iakimov	2d22ed810c	ci: fix android-e2e nightly builds (#18261 )	2023-12-21 14:36:16 +01:00
Flavio Fraschetti Flavio Fraschetti Ajay Sivan	e59e34d0da	Communities: Present the list of airdrop addresses (#18189 ) Co-authored-by: Flavio Fraschetti <frasqueti@gmail.com> Co-authored-by: Ajay Sivan <ajayesivan@gmail.com>	2023-12-21 01:27:59 -08:00
Mohamed Javid	60dfd6ce78	Added assets skeleton in wallet home and account screen (#18197 ) This commit: - Updates the "skeleton-list" component to support the "assets" type - Adds the assets skeleton to the assets tab in the wallet home and account screen Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2023-12-21 13:28:52 +05:30
Ajay Sivan	4ca533a534	Move disabled component tests outside of require block to fix lint messup (#18265 )	2023-12-20 22:18:59 -08:00
Tetiana Churikova	ec41b30794	e2e: updated profile view (#18203 )	2023-12-20 21:29:08 +01:00
Ulises Manuel	7cf31651b3	[#18083 ] Implement Page top component (#18163 ) * Add container style and fix `:auto-complete` parameter in address-input * Add container style to recovery-phrase input * Add container style and accessibility-label to search-input * Add page-top component and tests * Add page top preview	2023-12-20 13:17:39 -06:00
Ajay Sivan	04184b41e5	Wallet/Account Permissions Quo Component (#18224 )	2023-12-20 07:54:13 -08:00
Lungu Cristian	d0e624afd7	Biometrics button on login screen (#18106 ) * feat: login with biometry when switching accounts * feat: biometry button on login screen * fix: addressed review comments * fix: biometry button background * ref: moved biometrics constants to main constants file * fix: hide biometric button when not enabled * feat: standard_auth blur prop * fix: leftover rename	2023-12-20 17:15:51 +02:00
Volodymyr Kozieiev	bf55a2a974	Activity tab on collectible page (#18220 )	2023-12-20 14:53:29 +00:00
Omar Basem	8225d91ee0	Wallet: home top insets Wallet: home top insets	2023-12-20 18:23:27 +04:00
Mohsen	f631e1fe9d	[#17393 ] feat: add new setting ui (#18118 )	2023-12-20 17:03:49 +03:00
Andrea Maria Piana	32cfd214ca	Add fetch messages behind a toggle & some advanced settings This PR does a few things: 1) Add fetch messages implementation on any kind of chat. It's behind a toggle (on by default) as design is still unsure whether we want it, but it's very useful for debugging. 2) Allow setting light client from mobile It also partially remove node config management from the clojure part, as it's better if that's not explicitly managed by clients. Some parts are still relying on it but they are not functional (keycard), while others are still using it and will need to be updated eventually (syncing), in order to get rid completely of node config. Sets fleet to shards.test https://github.com/status-im/status-go/compare/90c31afe...1adcf02f	2023-12-20 13:04:29 +00:00
flexsurfer	800ca19c08	move keycard native module, removed outdated code (#18252 )	2023-12-20 13:53:53 +01:00
mmilad75andJamie Caprani	b70493691c	Implement Link Card component (#18080 ) * add basics * finalize component * add test structure * add tests * fix lint issues * move color to props * move variants to props * change file structure * working * finalize loader * fix tests * fix lint issues * fix style issues * fix typos * resolve comments --------- Co-authored-by: Jamie Caprani <jamiecaprani@gmail.com>	2023-12-20 14:07:04 +03:30
Ajay Sivan	a40862c5a9	Disable component tests that use `wait-for` helper function (#18243 )	2023-12-20 02:26:57 -08:00
Parvesh Monu	17c442a373	Add placeholder illustration in jump-to screen (#18229 )	2023-12-20 14:56:33 +05:30
Parvesh Monu	c74461db3a	remove unused react-native-intersection-observer library (#18230 )	2023-12-20 14:21:07 +05:30