updates

* Bugfixes for the style of "New to Status" screen

* Updates

.gitignore

@@ -100,9 +100,8 @@ Statusgo.xcframework
 
 #ios
 /ios/Pods/
+/ios/logs/
 /ios/StatusIm.xcworkspace
-/ios/react-native-xcode.log
-/ios/set_xcode_version.log
 .ruby-version
 status-e2e/
 
@@ -183,4 +182,4 @@ test/appium/tests/users.py
 /.calva/
 
 ## component-tests
-*.log
+*.log

.zprintrc

@@ -16,7 +16,11 @@
 
              ;; respect blank line
              ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-bl
-             :respect-bl]
+             :respect-bl
+
+             ;; 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

Makefile

@@ -349,8 +349,8 @@ 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: ##@test Run tests once in NodeJS
-	# Here we create the gyp bindings for nodejs
+component-test: ##@test Run component tests once in NodeJS
+	yarn install
 	yarn shadow-cljs compile component-test && \
 	jest --config=test/jest/jest.config.js
 

ci/Jenkinsfile.android

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.combined

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -63,6 +63,9 @@ pipeline {
       steps {
         script { api = ios.bundle() }
       }
+      post {
+        failure { archiveArtifacts 'ios/logs/*' }
+      }
     }
     stage('Parallel Upload') {
       parallel {

ci/Jenkinsfile.nix-cache

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/Jenkinsfile.tests

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -68,6 +68,14 @@ pipeline {
         }
       }
     }
+    stage('Component Tests') {
+      steps {
+        sh """#!/bin/bash
+          set -eo pipefail
+          make component-test 2>&1 | tee -a ${LOG_FILE}
+        """
+      }
+    }
     stage('Upload') {
       steps {
         script {

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-prs

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
 

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
 

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
   agent { label 'macos' }

ci/tools/Jenkinsfile.playstore-meta

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.6.6'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
   agent { label 'linux' }

ci/tools/Jenkinsfile.xcode-clean

@@ -0,0 +1,47 @@
+library 'status-jenkins-lib@v1.6.9'
+
+pipeline {
+  agent {
+    label 'linux'
+  }
+
+  triggers {
+    cron('H 5 * * *')
+  }
+
+  options {
+    timestamps()
+    /* Prevent Jenkins jobs from running forever */
+    timeout(time: 15, unit: 'MINUTES')
+    /* Disable concurrent jobs */
+    disableConcurrentBuilds()
+    /* Don't keep more than 50 builds */
+    buildDiscarder(logRotator(numToKeepStr: '10'))
+  }
+
+  stages {
+    stage('Get Nodes') {
+      steps { script {
+        stagePerNode = nodesByLabel('macos').collectEntries {
+          ["${it}" : generateNodeCleanupStage(it)]
+        }
+      } }
+    }
+
+    stage('Clean Xcode') {
+      steps { script {
+        parallel stagePerNode
+      } }
+    }
+  }
+}
+
+def generateNodeCleanupStage(nodeLabel) {
+  return { stage(nodeLabel) {
+    node(nodeLabel) {
+      dir('/Users/jenkins/Library/Developer/Xcode') {
+        sh 'rm -fr Archives DerivedData'
+      }
+    }
+  } }
+}

doc/new-guidelines.md

@@ -116,6 +116,20 @@ deref'ed atoms.
   {:background-color (colors/theme-colors colors/white colors/neutral-90)})
 ```
 
+### Custom Colors
+
+The Status designs have a lot of customization of user and group colors with components and pages. For consistency it is best to use `customization-color` as the prop key on pages and components. This will help easily identify what pages and components in the application are using customized colors.
+
+```clojure
+;; bad
+(defn community-card [{keys [custom-color]}] 
+  ...)
+
+;; good
+(defn community-card [{keys [customization-color]}] 
+  ...)
+```
+
 ### Using TODOs comments
 
 _TODO_ comments are used extensively in the codebase, but prefer to use them

doc/testing.md

@@ -18,8 +18,6 @@ Also test watcher can be launched. It will re-run the entire test suite when any
 
 Developers can also manually change the shadow-cljs option `:ns-regex` to control which namespaces the test runner should pick. 
 
-
-
 ## Testing with REPL
 
 The most convenient way to develop and run test locally is using REPL:
@@ -52,3 +50,19 @@ In the video below, you can see two buffers side-by-side. On the left the source
 Here I'm showing a terminal-only experience using Tmux (left pane Emacs, right pane the output coming from running the make target).
 
 [2022-12-19 13-17.webm](https://user-images.githubusercontent.com/46027/208471199-1909c446-c82d-42a0-9350-0c15ca562713.webm)
+
+## Component tests
+
+To run tests:
+
+```
+   make component-test
+```
+
+Also test watcher can be launched. It will re-run the entire test suite when any file is modified
+
+```
+   make component-test-watch
+```
+
+Check [component tests doc](./component-tests-overview.md) for more.

fastlane/Fastfile

@@ -123,6 +123,7 @@ def build_ios_adhoc(readonly: false, pr_build: false)
     export_method: 'ad-hoc',
     output_name: 'StatusIm',
     output_directory: 'status-ios',
+    buildlog_path: 'ios/logs',
     export_options: {
       signingStyle: 'manual',
       provisioningProfiles: {
@@ -162,6 +163,7 @@ def build_ios_e2e
     # 3. directory where to up StatusIm.app
     derived_data_path: 'status-ios',
     output_name: 'StatusIm.app',
+    buildlog_path: 'ios/logs',
     # -------------------------------------
     # Normal stuff
     scheme: 'StatusIm',
@@ -239,6 +241,7 @@ platform :ios do
       clean: true,
       export_method: 'app-store',
       output_directory: 'status-ios',
+      buildlog_path: 'ios/logs',
       include_symbols: false,
       export_options: {
         "combileBitcode": true,

ios/Podfile.lock

@@ -228,6 +228,8 @@ PODS:
     - React-Core
   - react-native-netinfo (4.7.0):
     - React
+  - react-native-orientation-locker (1.5.0):
+    - React-Core
   - react-native-randombytes (3.6.1):
     - React-Core
   - react-native-safe-area-context (2.0.0):
@@ -238,7 +240,7 @@ PODS:
     - React
   - react-native-status (1.0.0):
     - React
-  - react-native-status-keycard (2.5.38):
+  - react-native-status-keycard (2.5.39):
     - Keycard
     - React
   - react-native-webview (11.16.0):
@@ -433,6 +435,7 @@ DEPENDENCIES:
   - react-native-lottie-splash-screen (from `../node_modules/react-native-lottie-splash-screen`)
   - react-native-mail (from `../node_modules/react-native-mail`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
+  - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
   - react-native-randombytes (from `../node_modules/react-native-randombytes`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-shake (from `../node_modules/react-native-shake`)
@@ -545,6 +548,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-mail"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
+  react-native-orientation-locker:
+    :path: "../node_modules/react-native-orientation-locker"
   react-native-randombytes:
     :path: "../node_modules/react-native-randombytes"
   react-native-safe-area-context:
@@ -666,12 +671,13 @@ SPEC CHECKSUMS:
   react-native-lottie-splash-screen: 068688c15dd478301fda00f8d87d7fb7d5b9a93e
   react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
   react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
+  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-safe-area-context: 60f654e00b6cc416573f6d5dbfce3839958eb57a
   react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
   react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
   react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
-  react-native-status-keycard: f60ca57d789aad6875c64ece81ab06ef0609e0d3
+  react-native-status-keycard: f1c1227b2d5984c10fb44db68e4bfd2937f31e98
   react-native-webview: 28a8636d97ee641f2ee8f20492d7a6c269c1d703
   React-RCTActionSheet: e911b99f0d6fa7711ffc2f62d236b12a32771835
   React-RCTAnimation: ad8b853170a059faf31d6add34f67d22391bbe01

ios/StatusIm.xcodeproj/project.pbxproj

@@ -525,8 +525,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "set -o errexit\nexport NODE_BINARY=\"node\"\nexport NODE_ARGS=\" --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./react-native-xcode.log 2>&1";
+			shellPath = "/usr/bin/env sh";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\" --openssl-legacy-provider --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
 		};
 		0F876BD5356F61BF142A01A0 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -546,7 +546,7 @@
 				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-StatusImTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -568,7 +568,7 @@
 				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -583,8 +583,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "set -o errexit\nexport NODE_BINARY=\"node\"\nexport NODE_ARGS=\" --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./react-native-xcode.log 2>&1";
+			shellPath = "/usr/bin/env sh";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\" --openssl-legacy-provider --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
 		};
 		3AAD2AD724A3A60E0075D594 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -597,8 +597,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = /bin/sh;
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
+			shellPath = "/usr/bin/env sh";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
 		3C1038075AE5E6FB86AC2319 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -618,7 +618,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -640,7 +640,7 @@
 				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -662,7 +662,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
@@ -677,8 +677,8 @@
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = /bin/sh;
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./set_xcode_version.log 2>&1";
+			shellPath = "/usr/bin/env sh";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
 		E732E3E1B024946173BF6D3D /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -698,7 +698,7 @@
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
+			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};

ios/logs/README.md

@@ -0,0 +1,14 @@
+# Description
+
+This directory is the destination of logs created by Fastlane and React Native Xcode script.
+
+# Logs
+
+* `react-native-xcode.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`.
+  - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj`.
+* `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/).
+  - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.
+
+# CI
+
+These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`.

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java

@@ -797,7 +797,7 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
          final JSONObject jsonConfig = new JSONObject(configJSON);
          final String keyStorePath = pathCombine(this.getNoBackupDirectory(), "/keystore");
          jsonConfig.put("keystorePath", keyStorePath);
-
+         jsonConfig.put("rootDataDir", this.getNoBackupDirectory());
         executeRunnableStatusGoMethod(() -> Statusgo.inputConnectionStringForBootstrapping(connectionString, jsonConfig.toString()), callback);
     }
 
@@ -1139,11 +1139,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         executeRunnableStatusGoMethod(() -> Statusgo.generateAlias(seed), callback);
     }
 
-    @ReactMethod
-    public void emojiHash(final String publicKey, final Callback callback) throws JSONException {
-        executeRunnableStatusGoMethod(() -> Statusgo.emojiHash(publicKey), callback);
-    }
-
     @ReactMethod(isBlockingSynchronousMethod = true)
     public String identicon(final String seed) {
         return Statusgo.identicon(seed);

modules/react-native-status/ios/RCTStatus/RCTStatus.m

@@ -329,12 +329,13 @@ RCT_EXPORT_METHOD(inputConnectionStringForBootstrapping:(NSString *)cs
     NSDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];
     NSFileManager *fileManager = [NSFileManager defaultManager];
     NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
+    NSURL *rootDataDir = rootUrl.path;
     NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
     NSString *keystoreDir = multiaccountKeystoreDir.path;
 
     [configDict setValue:keystoreDir forKey:@"keystorePath"];
+    [configDict setValue:rootDataDir forKey:@"rootDataDir"];
     NSString *modifiedConfigJSON = [configDict bv_jsonStringWithPrettyPrint:NO];
-
     NSString *result = StatusgoInputConnectionStringForBootstrapping(cs,modifiedConfigJSON);
     callback(@[result]);
 }
@@ -865,12 +866,6 @@ RCT_EXPORT_METHOD(generateAliasAsync:(NSString *)publicKey
     callback(@[result]);
 }
 
-RCT_EXPORT_METHOD(emojiHash:(NSString *)publicKey
-                  callback:(RCTResponseSenderBlock)callback) {
-    NSString *result = StatusgoEmojiHash(publicKey);
-    callback(@[result]);
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(identicon:(NSString *)publicKey) {
   return StatusgoIdenticon(publicKey);
 }

nix/deps/gradle/README.md

@@ -24,6 +24,7 @@ Generating scripts:
 - `get_deps.sh` - Calls Gradle to get all the dependencies of sub-projects.
 - `gradle_parser.awk` - An AWK script that parses above Gradle output.
 - `url2json.sh` - Converts the list of URLs into a format consumable by Nix.
+- `add_package.sh` - Allows for adding a missing package manually.
 
 Finally we have the Nix derivation in `default.nix` which produces a derivation with all of the Gradle project dependencies:
 ```
@@ -66,9 +67,14 @@ You can use the `add_package.sh` script to add missing Gradle dependencies:
  > make shell TARGET=gradle
 Configuring Nix shell for target 'gradle'...
 
-[nix-shell:~/status-mobile]$ nix/deps/gradle/add_package.sh com.android.tools.build:gradle:3.4.0
+[nix-shell:~/work/status-mobile]$ nix/deps/gradle/add_package.sh com.android.tools.build:gradle:3.5.3
+Changes made:
+ nix/deps/gradle/deps.urls | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
 Regenerating Nix files...
-Found 548 direct dependencies...
-Successfully added: com.android.tools.build:gradle:3.4.0
+Successfully added: com.android.tools.build:gradle:3.5.3
+
+NOTICE: Running 'make nix-update-gradle' in a new shell is recommended.
 ```
-This may take a bit longer than normal `make nix-update-gradle` but should add the missing package.
+Keep in mind that the changes made by this script do not affect the already spawned shell.

nix/deps/gradle/add_package.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
-set -Eeu
+# This script allows for adding a package by providing a Maven full name.
+# Such name consists of 3 sections separated by the colon character.
+# Example: com.android.tools.build:gradle:3.5.3
+
+set -Eeuo pipefail
 
 if [[ $# -ne 1 ]]; then
     echo "Usage: add_package.sh <package>" >&2
@@ -18,12 +22,15 @@ source "${GIT_ROOT}/scripts/colors.sh"
 echo "${1}" | go-maven-resolver >> nix/deps/gradle/deps.urls
 
 # Remove duplicates and sort.
-sort -uo nix/deps/gradle/deps.urls nix/deps/gradle/deps.urls
+sort -uVo nix/deps/gradle/deps.urls nix/deps/gradle/deps.urls
+
+echo -e "${GRN}Changes made:${RST}" >&2
+git diff --stat nix/deps/gradle/deps.urls
+echo
 
 # Re-generate dependencies JSON.
 "${GIT_ROOT}/nix/deps/gradle/generate.sh" gen_deps_json
 
-# Re-generate dependencies list.
-"${GIT_ROOT}/nix/deps/gradle/generate.sh" gen_deps_list
-
 echo -e "${GRN}Successfully added:${RST} ${BLD}${1}${RST}" >&2
+echo
+echo -e "${YLW}NOTICE:${RST} Running '${BLD}make nix-update-gradle${RST}' in a new shell is recommended."

nix/deps/gradle/default.nix

@@ -1,68 +1,44 @@
 { stdenv, lib, pkgs, fetchurl, writeShellScriptBin }:
 
 let
-  inherit (lib)
-    removeSuffix optionalString splitString concatMapStrings
-    attrByPath attrValues last makeOverridable importJSON;
+  inherit (lib) concatStrings concatMapStrings mapAttrsToList makeOverridable;
 
-  inherit (pkgs) aapt2;
-
-  deps = importJSON ./deps.json;
-
-  # some .jar files have an `-aot` suffix that doesn't work for .pom files
-  getPOM = jarUrl: "${removeSuffix "-aot" jarUrl}.pom";
+  deps = lib.importJSON ./deps.json;
 
   script = writeShellScriptBin "create-local-maven-repo" (''
     mkdir -p $out
     cd $out
   '' +
-  (concatMapStrings (dep: 
-    let
-      url = "${dep.host}/${dep.path}";
-      pom = {
-        sha1 = attrByPath [ "pom" "sha1" ] "" dep;
-        sha256 = attrByPath [ "pom" "sha256" ] "" dep;
-      };
-      pom-download = optionalString (pom.sha256 != "") (
-        fetchurl { url = getPOM url; inherit (pom) sha256; }
-      );
-      jar = {
-        sha1 = attrByPath [ "jar" "sha1" ] "" dep;
-        sha256 = attrByPath [ "jar" "sha256" ] "" dep;
-      };
-      jar-download = optionalString (jar.sha256 != "") (
-        fetchurl { url = "${url}.${dep.type}"; inherit (jar) sha256; }
-      );
-      fileName = last (splitString "/" dep.path);
-      directory = removeSuffix fileName dep.path;
-    in
-      ''
-        mkdir -p ${directory}
-
-        ${optionalString (pom-download != "") ''
-        ln -s "${pom-download}" "${getPOM dep.path}"
-        ''}
-        ${optionalString (pom.sha1 != "") ''
-        echo "${pom.sha1}" > "${getPOM dep.path}.sha1"
-        ''}
-        ${optionalString (jar-download != "") ''
-        ln -s "${jar-download}" "${dep.path}.${dep.type}"
-        ''}
-        ${optionalString (jar.sha1 != "") ''
-        echo "${jar.sha1}" > "${dep.path}.${dep.type}.sha1"
-        ''}
+    # For each dependency in deps.json.
+    (concatMapStrings (dep: concatStrings
+      # And for each file in the 'files' dict of given dependency.
+      (mapAttrsToList (filename: hashes: let
+        # Download given file(POM, JAR, nodeps JAR, or AAR).
+        download = fetchurl {
+          url = "${dep.repo}/${dep.path}/${filename}";
+          inherit (hashes) sha256;
+        };
+        # And symlink it in the correct folder along with SHA1.
+      in ''
+        mkdir -p "${dep.path}"
+        ln -s "${download}" "${dep.path}/${filename}"
+        echo "${hashes.sha1}" > "${dep.path}/${filename}.sha1"
       '')
-    deps));
+      dep.files)
+    ) deps)
+  );
 
 in makeOverridable stdenv.mkDerivation {
   name = "status-mobile-maven-deps";
-  buildInputs = [ aapt2 ];
+
+  buildInputs = [ pkgs.aapt2 ];
+
   phases = [ "buildPhase" "patchPhase" ];
   buildPhase = "${script}/bin/create-local-maven-repo";
-  # Patched AAPT2 
+  # Replace AAPT2 package only with our patched version from overlay.
   patchPhase = ''
-    aapt2_dir=$out/com/android/tools/build/aapt2/${aapt2.version}
+    aapt2_dir=$out/com/android/tools/build/aapt2/${pkgs.aapt2.version}
     mkdir -p $aapt2_dir
-    ln -sf ${aapt2}/* $aapt2_dir
+    ln -sf ${pkgs.aapt2}/* $aapt2_dir
   '';
 }

nix/deps/gradle/deps.list

@@ -357,8 +357,8 @@ com.github.bumptech.glide:glide:4.12.0
 com.github.bumptech.glide:okhttp3-integration:4.12.0
 com.github.clans:fab:1.6.4
 com.github.gundy:semver4j:0.16.4
-com.github.status-im.status-keycard-java:android:3.0.4
-com.github.status-im.status-keycard-java:lib:3.0.4
+com.github.status-im.status-keycard-java:android:3.1.1
+com.github.status-im.status-keycard-java:lib:3.1.1
 com.github.status-im:function:0.0.1
 com.github.wix-playground:ahbottomnavigation:3.3.0
 com.github.wix-playground:reflow-animator:1.0.6

nix/deps/gradle/deps.urls

@@ -285,8 +285,8 @@ https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom
 https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.2/BlurView-version-2.0.2.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
-https://jitpack.io/com/github/status-im/status-keycard-java/android/3.0.4/android-3.0.4.pom
-https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.0.4/lib-3.0.4.pom
+https://jitpack.io/com/github/status-im/status-keycard-java/android/3.1.1/android-3.1.1.pom
+https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1.pom
 https://jitpack.io/com/github/wix-playground/ahbottomnavigation/3.3.0/ahbottomnavigation-3.3.0.pom
 https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animator-1.0.6.pom
 https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom
@@ -503,12 +503,12 @@ https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.1.1
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/2.21/istack-commons-2.21.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.1/istack-commons-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.1/jaxb-bom-ext-4.0.1.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.2/jaxb-bom-ext-4.0.2.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/2.2.11/jaxb-parent-2.2.11.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.1/jaxb-parent-4.0.1.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-parent/4.0.2/jaxb-parent-4.0.2.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-runtime-parent/2.2.11/jaxb-runtime-parent-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/2.2.11/jaxb-txw-parent-2.2.11.pom
-https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.1/jaxb-txw-parent-4.0.1.pom
+https://repo.maven.apache.org/maven2/com/sun/xml/bind/mvn/jaxb-txw-parent/4.0.2/jaxb-txw-parent-4.0.2.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/1.2.13/FastInfoset-1.2.13.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/2.1.0/FastInfoset-2.1.0.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/fastinfoset-project-1.2.13.pom
@@ -561,9 +561,9 @@ https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.pom
 https://repo.maven.apache.org/maven2/org/antlr/ST4/4.3.4/ST4-4.3.4.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.5.2-1/antlr4-master-4.5.2-1.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5.3.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.11.1/antlr4-master-4.11.1.pom
+https://repo.maven.apache.org/maven2/org/antlr/antlr4-master/4.12.0/antlr4-master-4.12.0.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.5.2-1/antlr4-runtime-4.5.2-1.pom
-https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.11.1/antlr4-runtime-4.11.1.pom
+https://repo.maven.apache.org/maven2/org/antlr/antlr4-runtime/4.12.0/antlr4-runtime-4.12.0.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.3/antlr-master-3.3.pom
 https://repo.maven.apache.org/maven2/org/antlr/antlr-master/3.5.2/antlr-master-3.5.2.pom
@@ -636,7 +636,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.70/bcprov-jdk15on-1.70.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.29.0/checker-qual-3.29.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.32.0/checker-qual-3.32.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
@@ -656,16 +656,17 @@ https://repo.maven.apache.org/maven2/org/easymock/easymock/5.1.0/easymock-5.1.0.
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.0/angus-activation-project-2.0.0.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.0/angus-activation-2.0.0.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.7/project-1.0.7.pom
+https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.8/project-1.0.8.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb-bom-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.1/jaxb-bom-4.0.1.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.2/jaxb-bom-4.0.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/2.2.11/jaxb-core-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.1/jaxb-core-4.0.1.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/4.0.2/jaxb-core-4.0.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.2.11/jaxb-runtime-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.2.11/txw2-2.2.11.pom
-https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.1/txw2-4.0.1.pom
+https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.2/txw2-4.0.2.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom

nix/deps/gradle/generate.sh

@@ -1,18 +1,16 @@
 #!/usr/bin/env bash
 
-# Stop on any failures, including in pipes
-set -e
-set -o pipefail
+# This script takes care of generating/updating the maven-sources.nix file
+# representing the offline Maven repo containing the dependencies
+# required to build the project
+
+set -Eeo pipefail
 
 if [[ -z "${IN_NIX_SHELL}" ]]; then
     echo "Remember to call 'make shell'!"
     exit 1
 fi
 
-# This script takes care of generating/updating the maven-sources.nix file
-# representing the offline Maven repo containing the dependencies
-# required to build the project
-
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 source "${GIT_ROOT}/scripts/colors.sh"
 
@@ -27,41 +25,43 @@ ulimit -n 16384
 
 # Generate list of Gradle sub-projects.
 function gen_proj_list() {
-    ${CUR_DIR}/get_projects.sh | sort -u -o ${PROJ_LIST}
-    echo -e "Found ${GRN}$(wc -l < ${PROJ_LIST})${RST} sub-projects..."
+    "${CUR_DIR}/get_projects.sh" | sort -u -o "${PROJ_LIST}"
+    echo -e "Found ${GRN}$(wc -l < "${PROJ_LIST}")${RST} sub-projects..."
 }
 
 # Check each sub-project in parallel, the ":" is for local deps.
 function gen_deps_list() {
-    PROJECTS=$(cat ${PROJ_LIST})
-    ${CUR_DIR}/get_deps.sh ":" ${PROJECTS[@]} | sort -uV -o ${DEPS_LIST}
-    echo -e "${CLR}Found ${GRN}$(wc -l < ${DEPS_LIST})${RST} direct dependencies..."
+    PROJECTS=$(cat "${PROJ_LIST}")
+    # WARNING: The ${PROJECTS[@]} needs to remain unquoted to expand correctly.
+    # shellcheck disable=SC2068
+    "${CUR_DIR}/get_deps.sh" ":" ${PROJECTS[@]} | sort -uV -o "${DEPS_LIST}"
+    echo -e "${CLR}Found ${GRN}$(wc -l < "${DEPS_LIST}")${RST} direct dependencies..."
 }
 
 # Find download URLs for each dependency.
 function gen_deps_urls() {
-    cat ${DEPS_LIST} | go-maven-resolver | sort -uV -o ${DEPS_URLS}
-    echo -e "${CLR}Found ${GRN}$(wc -l < ${DEPS_URLS})${RST} dependency URLs..."
+    go-maven-resolver < "${DEPS_LIST}" | sort -uV -o "${DEPS_URLS}"
+    echo -e "${CLR}Found ${GRN}$(wc -l < "${DEPS_URLS}")${RST} dependency URLs..."
 }
 
 # Generate the JSON that Nix will consume.
 function gen_deps_json() {
     # Open the Nix attribute set.
-    echo -n "[" > ${DEPS_JSON}
+    echo -n "[" > "${DEPS_JSON}"
 
     # Format URLs into a Nix consumable file.
-    URLS=$(cat ${DEPS_URLS})
+    URLS=$(cat "${DEPS_URLS}")
     # Avoid rate limiting by using 4 of the available threads.
     parallel --will-cite --keep-order --jobs 4 \
         "${CUR_DIR}/url2json.sh" \
-        ::: ${URLS} \
-        >> ${DEPS_JSON}
+        ::: "${URLS}" \
+        >> "${DEPS_JSON}"
 
     # Drop tailing comma on last object, stupid JSON
-    sed -i '$ s/},/}/' ${DEPS_JSON}
+    sed -i '$ s/},/}/' "${DEPS_JSON}"
 
     # Close the Nix attribute set
-    echo "]" >> ${DEPS_JSON}
+    echo "]" >> "${DEPS_JSON}"
 }
 
 # ------------------------------------------------------------------------------
@@ -74,7 +74,7 @@ cd "${GIT_ROOT}/android"
 ./gradlew --stop >/dev/null
 
 # A way to run a specific stage of generation
-if [[ -n "${1}" ]] && type ${1} > /dev/null; then
+if [[ -n "${1}" ]] && type "${1}" > /dev/null; then
     ${1}; exit 0
 elif [[ -n "${1}" ]]; then
     echo "No such function: ${1}"; exit 1
@@ -86,6 +86,6 @@ gen_deps_list
 gen_deps_urls
 gen_deps_json
 
-REL_DEPS_JSON=$(realpath --relative-to=${PWD} ${DEPS_JSON})
+REL_DEPS_JSON=$(realpath --relative-to="${PWD}" "${DEPS_JSON}")
 echo -e "${CLR}Generated Nix deps file: ${REL_DEPS_JSON#../}"
 echo -e "${GRN}Done${RST}"

nix/deps/gradle/get_deps.sh

@@ -1,12 +1,19 @@
 #!/usr/bin/env bash
 
-set -Eeu
+# This script generates a list of dependencies for the main project and its
+# sub-projects defined using Gradle config files. It parses Gradle output of
+# 'dependencies' and 'buildEnvironment` tasks using AWK.
+
+set -Eeuo pipefail
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-# Gradle needs to be run in 'android' subfolder
+# Gradle needs to be run in 'android' subfolder.
 cd "${GIT_ROOT}/android"
 
-AWK_SCRIPT="${GIT_ROOT}/nix/deps/gradle/gradle_parser.awk"
+# Show Gradle log in case of failure.
+GRADLE_LOG_FILE='/tmp/gradle.log'
+function show_gradle_log() { cat "${GRADLE_LOG_FILE}" >&2; }
+trap show_gradle_log ERR
 
 # Run the gradle command for a project:
 # - ':buildEnvironment' to get build tools
@@ -20,16 +27,11 @@ for i in "${!DEPS[@]}"; do
     NORMAL_DEPS[${i}]="${DEPS[${i}]}:dependencies"
 done
 
-# And clean up the output by:
-# - keep only lines that start with \--- or +---
-# - drop lines that end with (*) or (n) but don't start with (+)
-# - drop lines that refer to a project
-# - drop entries starting with `status-im:` like `status-go`
-# - drop entries that aren't just the name of the dependency
-# - extract the package name and version, ignoring version range indications,
-#   such as in `com.google.android.gms:play-services-ads:[15.0.1,16.0.0) -> 15.0.1`
+# And clean up the output using AWK script.
+AWK_SCRIPT="${GIT_ROOT}/nix/deps/gradle/gradle_parser.awk"
 
 ./gradlew --no-daemon --console plain \
     "${BUILD_DEPS[@]}" \
     "${NORMAL_DEPS[@]}" \
-    | awk -f ${AWK_SCRIPT}
+    | tee "${GRADLE_LOG_FILE}" \
+    | awk -f "${AWK_SCRIPT}"

nix/deps/gradle/get_projects.sh

@@ -1,12 +1,22 @@
 #!/usr/bin/env bash
 
-set -Eeu
+# This script generates a list of Gradle sub-projects by parsing the output
+# of Gradle 'projects' task using grep and sed. It is necessary in order to
+# collect list of dependencies for main project and its sub-projects.
+
+set -Eeuo pipefail
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-# Gradle needs to be run in 'android' subfolder
+# Gradle needs to be run in 'android' subfolder.
 cd "${GIT_ROOT}/android"
 
+# Show Gradle log in case of failure.
+GRADLE_LOG_FILE='/tmp/gradle.log'
+function show_gradle_log() { cat "${GRADLE_LOG_FILE}" >&2; }
+trap show_gradle_log ERR
+
 # Print all our sub-projects
 ./gradlew projects --no-daemon --console plain 2>&1 \
+    | tee "${GRADLE_LOG_FILE}" \
     | grep "Project ':" \
     | sed -E "s;^.--- Project '\:([@_a-zA-Z0-9\-]+)';\1;"

nix/deps/gradle/proj.list

@@ -26,6 +26,7 @@ react-native-lottie-splash-screen
 react-native-mail
 react-native-navigation
 react-native-nfc-manager
+react-native-orientation-locker
 react-native-permissions
 react-native-randombytes
 react-native-reanimated

nix/deps/gradle/url2json.sh

@@ -6,8 +6,6 @@
 # a local Maven repository.
 #
 
-CUR_DIR=$(cd "${BASH_SOURCE%/*}" && pwd)
-
 # This defines URLs of Maven repos we know about and use.
 declare -a REPOS=(
   "https://repo.maven.apache.org/maven2"
@@ -36,84 +34,88 @@ function match_repo_url() {
     exit 1
 }
 
+function pom_has_nodeps_jar() {
+    grep '<shadedClassifierName>nodeps</shadedClassifierName>' "${1}" \
+        >/dev/null 2>&1 
+}
+
+function fetch_and_template_file() {
+    local FILENAME="${1}"
+    local OBJ_URL OBJ_NIX_FETCH_OUT OBJ_NAME OBJ_PATH
+
+    OBJ_URL="${REPO_URL}/${PKG_PATH}/${FILENAME}"
+    if ! OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_URL}"); then
+        echo " ! Failed to fetch: ${OBJ_URL}" >&2
+        exit 1
+    fi
+
+    OBJ_NAME="${FILENAME}"
+    OBJ_PATH=$(get_nix_path "${OBJ_NIX_FETCH_OUT}")
+    echo -n ",
+      \"${OBJ_NAME}\": {
+        \"sha1\": \"$(get_sha1 "${OBJ_PATH}")\",
+        \"sha256\": \"$(get_nix_sha "${OBJ_NIX_FETCH_OUT}")\"
+      }"
+}
+
 if [[ -z "${1}" ]]; then
-    echo "Required argument not given!" >&2
+    echo "Required POM URL argument not given!" >&2
     exit 1
 fi
-
 POM_URL=${1}
-# Drop the POM extension
-OBJ_REL_URL=${POM_URL%.pom}
+# Drop the POM extension.
+PKG_URL_NO_EXT="${POM_URL%.pom}"
+# Name of package without extension.
+PKG_NAME="$(basename "${PKG_URL_NO_EXT}")"
 
 echo -en "${CLR} - Nix entry for: ${1##*/}\r" >&2
 
-REPO_URL=$(match_repo_url "${OBJ_REL_URL}")
+REPO_URL=$(match_repo_url "${PKG_URL_NO_EXT}")
 
 if [[ -z "${REPO_URL}" ]]; then
-    echo "\r\n ? REPO_URL: ${REPO_URL}" >&2
+    echo " ! Repo URL not found: %s" "${REPO_URL}" >&2
+    exit 1
 fi
 # Get the relative path without full URL
-OBJ_REL_NAME="${OBJ_REL_URL#${REPO_URL}/}"
+PKG_PATH="${PKG_URL_NO_EXT#"${REPO_URL}/"}"
+PKG_PATH="$(dirname "${PKG_PATH}")"
 
 # Both JARs and AARs have a POM
-POM_NIX_FETCH_OUT=$(nix_fetch "${OBJ_REL_URL}.pom")
+POM_NIX_FETCH_OUT=$(nix_fetch "${PKG_URL_NO_EXT}.pom")
 POM_PATH=$(get_nix_path "${POM_NIX_FETCH_OUT}")
+POM_NAME=$(basename "${PKG_URL_NO_EXT}.pom")
 if [[ -z "${POM_PATH}" ]]; then
-    echo " ! Failed to fetch: ${OBJ_REL_URL}.pom" >&2
+    echo " ! Failed to fetch: ${PKG_URL_NO_EXT}.pom" >&2
     exit 1
 fi
 POM_SHA256=$(get_nix_sha "${POM_NIX_FETCH_OUT}")
 POM_SHA1=$(get_sha1 "${POM_PATH}")
 
-# Identify packaging type, JAR, AAR, or just POM.
-OBJ_TYPE_RAW=$(grep -oP '<packaging>\K[^<]+' "${POM_PATH}")
-# Bundle is a JAR made using maven-bundle-plugin.
-case "${OBJ_TYPE_RAW}" in
-    ''|'bundle') OBJ_TYPE=jar;;
-    'aar.asc')   OBJ_TYPE=aar;;
-    *)           OBJ_TYPE="${OBJ_TYPE_RAW}"
-esac
+# Identify packaging type, JAR, AAR, bundle, or just POM.
+OBJ_TYPE=$(grep -oP '<packaging>\K[^<]+' "${POM_PATH}")
 
 # Some deps are Eclipse plugins, and we don't need those.
 if [[ "${OBJ_TYPE}" == "eclipse-plugin" ]]; then
     exit 0
 fi
 
-# Some deps are just POMs, in which case there is no JAR to fetch.
-if [[ "${OBJ_TYPE}" != "pom" ]]; then
-    OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_REL_URL}.${OBJ_TYPE}")
-    # If type was a JAR or other, not getting one is an error.
-    if [[ ${?} -ne 0 ]]; then
-        # POMs without packaging type defined can still include JARs.
-        if [[ "${OBJ_TYPE_RAW}" != "" ]]; then
-            echo " ! Failed to fetch: ${OBJ_REL_URL}.${OBJ_TYPE}" >&2
-            exit 1
-        fi
-    else
-        OBJ_PATH=$(get_nix_path "${OBJ_NIX_FETCH_OUT}")
-        OBJ_SHA256=$(get_nix_sha "${OBJ_NIX_FETCH_OUT}")
-        OBJ_SHA1=$(get_sha1 "${OBJ_PATH}")
-    fi
-fi
-
 # Format into a Nix attrset entry
 echo -ne "
   {
-    \"path\": \"${OBJ_REL_NAME}\",
-    \"host\": \"${REPO_URL}\",
-    \"type\": \"${OBJ_TYPE}\","
-if [[ -n "${POM_SHA256}" ]]; then
-    echo -n "
-    \"pom\": {
-      \"sha1\": \"${POM_SHA1}\",
-      \"sha256\": \"${POM_SHA256}\"
-    }";[[ -n "${OBJ_SHA256}" ]] && echo -n ","
-fi
-if [[ -n "${OBJ_SHA256}" ]]; then
-    echo -n "
-    \"jar\": {
-      \"sha1\": \"${OBJ_SHA1}\",
-      \"sha256\": \"${OBJ_SHA256}\"
-    }"
-fi
-echo -e "\n  },"
+    \"path\": \"${PKG_PATH}\",
+    \"repo\": \"${REPO_URL}\",
+    \"files\": {
+      \"${POM_NAME}\": {
+        \"sha1\": \"${POM_SHA1}\",
+        \"sha256\": \"${POM_SHA256}\"
+      }"
+
+# Some deps are just POMs, in which case there is no JAR to fetch.
+[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file "${PKG_NAME}.jar"
+[[ "${OBJ_TYPE}" == "jar" ]]     && fetch_and_template_file "${PKG_NAME}.jar"
+[[ "${OBJ_TYPE}" == "bundle" ]]  && fetch_and_template_file "${PKG_NAME}.jar"
+[[ "${OBJ_TYPE}" =~ aar* ]]      && fetch_and_template_file "${PKG_NAME}.aar"
+[[ "${OBJ_TYPE}" == "aar.asc" ]] && fetch_and_template_file "${PKG_NAME}.${OBJ_TYPE}"
+pom_has_nodeps_jar "${POM_PATH}" && fetch_and_template_file "${PKG_NAME}-nodeps.jar"
+
+echo -e '\n    }\n  },'

nix/deps/nodejs-patched/default.nix

@@ -29,7 +29,14 @@ stdenv.mkDerivation {
   # maven and google central repositories with our own local directories.
   # This prevents the builder from downloading Maven artifacts
   patchGradlePhase = ''
-    for modBuildGradle in $(find -L ./node_modules -name build.gradle); do
+    gradleConfigs=$(
+      find -L ./node_modules \
+        -name build.gradle -or \
+        -name build.gradle.kts -or \
+        -name settings.gradle -or \
+        -name settings.gradle.kts
+    )
+    for modBuildGradle in $gradleConfigs; do
       relativeToNode=''${modBuildGradle#*node_modules/}
       moduleName=''${relativeToNode%%/*}
       if [[ -L ./node_modules/$moduleName ]]; then

nix/mobile/ios/default.nix

@@ -20,6 +20,7 @@ in {
     ];
 
     # WARNING: Executes shellHook in reverse order.
+    # WARNING: Only some variables are merged.
     inputsFrom = [
       fastlane.shell
       cocoapods-sh

nix/mobile/ios/shells/nodejs.nix

@@ -1,8 +1,14 @@
-{ mkShell, deps }:
+{ mkShell, nodejs, deps }:
 
 mkShell {
-  # check if node modules changed and if so install them
+  # Check if node modules changed and if so install them.
   shellHook = ''
+    # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
+    export NODE_OPTIONS="--openssl-legacy-provider";
+
+    # Fix Xcode using system Node.js version.
+    export NODE_BINARY="${nodejs}/bin/node";
+
     export STATUS_MOBILE_HOME=$(git rev-parse --show-toplevel)
     "$STATUS_MOBILE_HOME/nix/scripts/node_modules.sh" ${deps.nodejs-patched}
   '';

nix/overlay.nix

@@ -32,6 +32,18 @@ in {
   # For parsing gradle.properties into an attrset
   gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
 
+  # Clojure formatting tool
+  zprint = super.zprint.override rec {
+    buildGraalvmNativeImage = args: super.buildGraalvmNativeImage ( args // rec {
+      inherit (args) pname;
+      version = "1.2.5";
+      src = self.fetchurl {
+        url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
+        sha256 = "sha256-PWdR5jqyzvTk9HoxqDldwtZNik34dmebBtZZ5vtva4A=";
+      };
+    });
+  };
+
   # Package version adjustments
   gradle = super.gradle_5;
   nodejs = super.nodejs-16_x;

nix/pkgs/patch-maven-srcs/default.nix

@@ -16,7 +16,8 @@ writeScript "patch-maven-srcs" (''
   gradleFile="$1"
 
   # Some of those find something, some don't, that's fine.
-  patchMavenSource "$gradleFile" 'mavenCentral()' 'mavenLocal()'
-  patchMavenSource "$gradleFile" 'google()'       'mavenLocal()'
-  patchMavenSource "$gradleFile" 'jcenter()'      'mavenLocal()'
+  patchMavenSource "$gradleFile" 'mavenCentral()'       'mavenLocal()'
+  patchMavenSource "$gradleFile" 'google()'             'mavenLocal()'
+  patchMavenSource "$gradleFile" 'jcenter()'            'mavenLocal()'
+  patchMavenSource "$gradleFile" 'gradlePluginPortal()' 'mavenLocal()'
 '')

nix/shell.nix

@@ -12,7 +12,7 @@ in mkShell {
 
   buildInputs = with pkgs; lib.unique ([
     # core utilities that should always be present in a shell
-    bash curl wget file unzip flock
+    bash curl wget file unzip flock procps
     git gnumake jq ncurses gnugrep parallel
     lsof # used in start-react-native.sh
     # build specific utilities
@@ -22,7 +22,7 @@ in mkShell {
     # other nice to have stuff
     yarn nodejs python27
   ] # and some special cases
-    ++ lib.optionals stdenv.isDarwin [ cocoapods clang ]
+    ++ lib.optionals stdenv.isDarwin [ cocoapods clang tcl ]
     ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ]
   );
 

package.json

@@ -19,7 +19,7 @@
     "@babel/preset-typescript": "^7.17.12",
     "@react-native-async-storage/async-storage": "^1.17.9",
     "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
-    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.0-status",
+    "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur#refs/tags/v4.3.1-status",
     "@react-native-community/cameraroll": "git+https://github.com/status-im/react-native-cameraroll.git#refs/tags/v4.0.4-status.0",
     "@react-native-community/clipboard": "^1.2.2",
     "@react-native-community/hooks": "^2.5.1",
@@ -28,7 +28,6 @@
     "@react-native-community/push-notification-ios": "^1.4.1",
     "@react-native-community/slider": "^3.0.0",
     "@walletconnect/client": "^2.0.0-beta.23",
-    "@walletconnect/client-legacy": "npm:@walletconnect/client@^1.7.1",
     "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/v4.0.2-status",
     "chance": "^1.1.0",
     "create-react-class": "^15.6.2",
@@ -62,6 +61,7 @@
     "react-native-lottie-splash-screen": "^1.0.1",
     "react-native-mail": "^6.1.1",
     "react-native-navigation": "^7.27.1",
+    "react-native-orientation-locker": "^1.5.0",
     "react-native-permissions": "^2.1.5",
     "react-native-randombytes": "^3.6.1",
     "react-native-reanimated": "2.3.3",
@@ -69,7 +69,7 @@
     "react-native-safe-area-context": "^2.0.0",
     "react-native-shake": "^3.3.1",
     "react-native-share": "^7.0.1",
-    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.38",
+    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39",
     "react-native-svg": "^9.8.4",
     "react-native-touch-id": "^4.4.1",
     "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",