e2e: separated tests to run in PRs

Signed-off-by: Brian Sztamfater <brian@status.im>

.clj-kondo/config.edn

@@ -1,4 +1,5 @@
 {:config-paths ["status-im"]
+ :output       {:exclude-files ["src/user.cljs" "src/dev/user.cljs"]}
  :lint-as      {legacy.status-im.utils.views/defview clojure.core/defn
                 legacy.status-im.utils.views/letsubs clojure.core/let
                 reagent.core/with-let                clojure.core/let
@@ -9,12 +10,16 @@
                 legacy.status-im.utils.styles/def    clojure.core/def
                 legacy.status-im.utils.styles/defn   clojure.core/defn
                 test-helpers.unit/deftest-sub        clojure.core/defn
+                test-helpers.unit/deftest-event      clojure.core/defn
+
                 taoensso.tufte/defnp                 clojure.core/defn}
  :linters      {:case-duplicate-test           {:level :error}
                 :case-quoted-test              {:level :error}
                 :case-symbol-test              {:level :error}
                 :clj-kondo-config              {:level :error}
                 :cond-else                     {:level :error}
+                :condition-always-true         {:level :error}
+                :conflicting-alias             {:level :error}
                 :consistent-alias              {:level   :error
                                                 :aliases {clojure.set             set
                                                           clojure.string          string
@@ -26,7 +31,7 @@
                                                           malli.generator         malli.generator
                                                           malli.transform         malli.transform
                                                           malli.util              malli.util
-                                                          promesa.core            p
+                                                          promesa.core            promesa
                                                           schema.core             schema
                                                           status-im.feature-flags ff
                                                           taoensso.timbre         log}}
@@ -42,11 +47,13 @@
                 :missing-body-in-when          {:level :error}
                 :missing-clause-in-try         {:level :error}
                 :missing-else-branch           {:level :error}
+                :multiple-async-in-deftest     {:level :error}
                 :not-empty?                    {:level :error}
                 :plus-one                      {:level :error}
                 :redundant-do                  {:level :error}
                 :redundant-let                 {:level :error}
                 :refer-all                     {:level :error}
+                :shadowed-fn-param             {:level :error}
                 :shadowed-var                  {:level   :error
                                                 ;; We temporarily use :include to define an
                                                 ;; allowlist of core Clojure vars. In the
@@ -54,9 +61,11 @@
                                                 ;; vars, we should be able to delete this
                                                 ;; option and lint all vars.
                                                 :exclude [type name]}
+                :self-requiring-namespace      {:level :error}
                 :single-operand-comparison     {:level :error}
                 :syntax                        {:level :error}
                 :unbound-destructuring-default {:level :error}
+                :underscore-in-namespace       {:level :error}
                 :uninitialized-var             {:level :error}
                 :unknown-require-option        {:level :error}
                 :unreachable-code              {:level :error}

.clj-kondo/status-im/cljs/test.clj

@@ -0,0 +1,21 @@
+(ns cljs.test
+  (:require [clj-kondo.hooks-api :as hooks]))
+
+(defn deftest
+  "Verify test name passed to `cljs.test/deftest` is suffixed with -test and not
+  prefixed with test-."
+  [{:keys [node]}]
+  (let [[_ test-name-node & _] (:children node)
+        test-name              (str (hooks/sexpr test-name-node))]
+    (when (and (hooks/token-node? test-name-node)
+               (or (not (re-find #"^.*-test$" test-name))
+                   (re-find #"^test-.*$" test-name)))
+      (hooks/reg-finding! (assoc (meta test-name-node)
+                                 :message "Test name should be suffixed with -test"
+                                 :type    :status-im.linter/inconsistent-test-name)))))
+
+(comment
+  ;; Invalid
+  (deftest {:node (hooks/parse-string "(deftest foo-tes (println :hello))")})
+  (deftest {:node (hooks/parse-string "(deftest test-foo-test (println :hello))")})
+)

.clj-kondo/status-im/config.edn

@@ -4,5 +4,8 @@
    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}}}
+   test-helpers.component/query-by-translation-text     utils.i18n/label
+
+   cljs.test/deftest                                    cljs.test/deftest}}
+ :linters {:status-im.linter/invalid-translation-keyword {:level :error}
+           :status-im.linter/inconsistent-test-name      {:level :error}}}

.env

@@ -26,7 +26,6 @@ APN_TOPIC=im.status.ethereum.pr
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
-COLLECTIBLES_ENABLED=1
 COMMANDS_ENABLED=1
 TWO_MINUTES_SYNCING=1
 SWAP_ENABLED=1
@@ -34,3 +33,6 @@ STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 TEST_STATEOFUS=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1
+SHOW_NOT_IMPLEMENTED_FEATURES=0
+ENABLE_ALERT_BANNER=0

.env.e2e

@@ -33,3 +33,8 @@ TWO_MINUTES_SYNCING=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1
+SHOW_NOT_IMPLEMENTED_FEATURES=1
+DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000
+DELETE_MESSAGE_UNDO_TIME_LIMIT=10000
+ENABLE_ALERT_BANNER=0

.env.jenkins

@@ -35,3 +35,5 @@ ENABLE_QUO_PREVIEW=1
 STICKERS_TEST_ENABLED=1
 LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
+TEST_NETWORKS_ENABLED=1
+ENABLE_ALERT_BANNER=1

.env.nightly

@@ -22,3 +22,5 @@ COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
+TEST_NETWORKS_ENABLED=0
+ENABLE_ALERT_BANNER=1

.env.release

@@ -18,5 +18,5 @@ PARTITIONED_TOPIC=0
 ENABLE_ROOT_ALERT=1
 MAX_IMAGES_BATCH=1
 DELETE_MESSAGE_ENABLED=1
-COLLECTIBLES_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
+TEST_NETWORKS_ENABLED=0

.github/ISSUE_TEMPLATE/bug-report.md

@@ -2,7 +2,7 @@
 name: MVPBug Report
 about: MVPBug Report
 title: ''
-labels: 'E:Mobile Bug MVP'
+labels: ['E:Mobile Bug MVP', ':1234: low prio']
 assignees: ''
 
 ---

.github/PULL_REQUEST_TEMPLATE.md

@@ -70,3 +70,19 @@ Documentation change PR (review please): https://github.com/status-im/status.im/
 | Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after. |
 
 status: ready <!-- Can be ready or wip -->
+
+<!-- Uncomment this section for status-go upgrade/dogfooding pull requests
+
+- Specify potentially impacted user flows in _Areas that maybe impacted*.
+- Ensure that _Steps to test_ is filled in.
+
+### Risk
+
+Described potential risks and worst case scenarios.
+
+Tick **one**:
+- [ ] Low risk: 2 devs MUST perform testing as specified above and attach their results as comments to this PR **before** merging.
+- [ ] High risk: QA team MUST perform additional testing in the specified affected areas **before** merging.
+
+
+-->

.gitignore

@@ -83,6 +83,9 @@ shim.js
 figwheel_server.log
 .nrepl-port
 
+# FlowStorm (Clojure debugger)
+repl-client-debug
+
 # Lein
 #
 .lein-failures
@@ -127,6 +130,8 @@ fastlane/README.md
 # Clj
 
 .cpcache/
+src/user.cljs
+src/dev/user.cljs
 
 # emacs
 .dir-locals.el

.zprintrc

@@ -41,6 +41,7 @@
   "reg-fx"            :arg1-pair
   "testing"           :arg1-body
   "deftest-sub"       :arg1-body
+  "deftest-event"     :arg1-body
   "test-async"        :arg1-body
   "wait-for"          :arg1-body
   "with-deps-check"   :arg1-body

Makefile

@@ -32,7 +32,7 @@ ifndef BUILD_TAG
 export BUILD_TAG := $(shell git rev-parse --short HEAD)
 endif
 
-# We don't want to use /run/user/$UID because it runs out of space too easilly.
+# We don't want to use /run/user/$UID because it runs out of space too easily.
 export TMPDIR = /tmp/tmp-status-mobile-$(BUILD_TAG)
 # This has to be specified for both the Node.JS server process and the Qt process.
 export REACT_SERVER_PORT ?= 5001
@@ -139,7 +139,7 @@ _install-hooks: ##@prepare Create prepare-commit-msg git hook symlink
 
 # Remove directories and ignored files
 clean: SHELL := /bin/sh
-clean: _fix-node-perms _tmpdir-rm ##@prepare Remove all output folders
+clean: _fix-node-perms _tmpdir-rm ios-clean android-clean ##@prepare Remove all output folders
 	git clean -dXf
 
 # Remove directories, ignored and non-ignored files
@@ -196,6 +196,10 @@ xcode-clean: XCODE_HOME := $(HOME)/Library/Developer/Xcode
 xcode-clean: ##@prepare Clean XCode derived data and archives
 	rm -fr $(XCODE_HOME)/DerivedData/StatusIm-* $(XCODE_HOME)/Archives/*/StatusIm*
 
+ios-simulator-cache-clean: SHELL := /bin/sh
+ios-simulator-cache-clean: ##@prepare Clean iOS Simulator Caches
+	rm -rf ~/Library/Developer/CoreSimulator/Cache
+
 #----------------
 # Release builds
 #----------------
@@ -349,13 +353,11 @@ test: export SHADOW_NS_REGEXP := .*-test$$
 test: ##@test Run all Clojure tests
 test: _test-clojure
 
+test-watch-for-repl: export TARGET := default
 test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
-test-watch-for-repl: status-go-library
 test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	yarn node-pre-gyp rebuild
-	rm -f target/test/test.js
-	yarn shadow-cljs compile mocks && \
+	yarn install && shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
 		'yarn shadow-cljs watch test --verbose' \
 		"until [ -f $$SHADOW_OUTPUT_TO ] ; do sleep 1 ; done ; node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO --repl"
@@ -375,30 +377,41 @@ test-contract: export SHADOW_NS_REGEXP := ^tests\.contract-test.*$$
 test-contract: ##@test Run contract tests
 test-contract: _test-clojure
 
-android-test: jsbundle
-android-test: export TARGET := android
-android-test:
+test-android: jsbundle
+test-android: export TARGET := android
+test-android: ##@test Android Gradle test
 	cd android && ./gradlew 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
+test-component-watch: export TARGET := clojure
+test-component-watch: export COMPONENT_TEST := true
+test-component-watch: export BABEL_ENV := test
+test-component-watch: export JEST_USE_SILENT_REPORTER := false
+test-component-watch: ##@ Watch tests and re-run no changes to cljs files
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
 
-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
+test-component: export TARGET := clojure
+test-component: export COMPONENT_TEST := true
+test-component: export BABEL_ENV := test
+test-component: export JEST_USE_SILENT_REPORTER := false
+test-component: ##@test Run component tests once in NodeJS
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	yarn shadow-cljs compile component-test && \
 	jest --clearCache && jest --config=test/jest/jest.config.js --testEnvironment node
 
+# Reference: https://flow-storm.github.io/flow-storm-debugger/user_guide.html#_debugging_react_native_applications
+run-flow-storm: export SHADOW_CLJS_BUILD_ID := :mobile
+run-flow-storm: export TARGET := clojure
+run-flow-storm: export GDK_DPI_SCALE := 1.0
+run-flow-storm: ##@run Start FlowStorm debugger
+	clj -Sforce -Sdeps '{:deps {com.github.jpmonettas/flow-storm-dbg {:mvn/version "3.7.5"}}}' \
+		-X flow-storm.debugger.main/start-debugger \
+		:port 7888 \
+		:repl-type :shadow \
+		:build-id $(SHADOW_CLJS_BUILD_ID)
+
 #--------------
 # Other
 #--------------
@@ -409,25 +422,47 @@ geth-connect: ##@other Connect to Geth on the device
 	build/bin/geth attach http://localhost:8545
 
 ios-clean: SHELL := /bin/sh
+ios-clean: ios-simulator-cache-clean
 ios-clean: ##@prepare Clean iOS build artifacts
 	git clean -dxf -f target/ios
 
-android-clean: export TARGET := gradle
+android-clean: SHELL := /bin/sh
 android-clean: ##@prepare Clean Gradle state
 	git clean -dxf -f ./android/app/build; \
-	[[ -d android/.gradle ]] && cd android && ./gradlew clean
+	rm -rf android/.gradle \
+	rm -rf android/build \
+	rm -rf ~/.gradle
 
+
+android-ports: export FLOWSTORM_PORT := 7722
 android-ports: export TARGET := android-sdk
 android-ports: ##@other Add proxies to Android Device/Simulator
 	adb reverse tcp:8081 tcp:8081 && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
+	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \
 	adb forward tcp:5561 tcp:5561
 
 android-devices: export TARGET := android-sdk
 android-devices: ##@other Invoke adb devices
 	adb devices
 
+android-pull-geth: export TARGET := android-sdk
+android-pull-geth: export VERSION ?= debug
+android-pull-geth:
+	adb pull "/storage/emulated/0/Android/data/im.status.ethereum$$( [ "$(VERSION)" = "release" ] || echo ".$(VERSION)" )/files/Download/geth.log"
+
+android-tail-geth: export TARGET := android-sdk
+android-tail-geth: export VERSION ?= debug
+android-tail-geth:
+	adb shell 'while true; do cat; sleep 1; done < /storage/emulated/0/Android/data/im.status.ethereum$$( [ "$(VERSION)" = "release" ] || echo ".$(VERSION)" )/files/Download/geth.log'
+
+android-clean-geth: export TARGET := android-sdk
+android-clean-geth: export VERSION ?= debug
+android-clean-geth:
+	adb shell 'rm /storage/emulated/0/Android/data/im.status.ethereum$$( [ "$(VERSION)" = "release" ] || echo ".$(VERSION)" )/files/Download/geth.log'
+
+
 android-logcat: export TARGET := android-sdk
 android-logcat: ##@other Read status-mobile logs from Android phone using adb
 	adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG   :' -e 'Go      :' -e 'GoLog   :' -e 'libc    :'
@@ -441,6 +476,10 @@ _list: SHELL := /bin/sh
 _list:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
 
+patch-file: export TARGET := default
+patch-file: ##@other Generates patch file for npm deps
+	@scripts/patch-npm-lib.sh
+
 #--------------
 # REPLs
 #--------------

VERSION

@@ -1 +1 @@
-2.27.0
+2.29.0

android/app/build.gradle

@@ -59,7 +59,7 @@ react {
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
-def enableProguardInReleaseBuilds = false
+def enableProguardInReleaseBuilds = true
 
 /**
  * The preferred build flavor of JavaScriptCore (JSC)
@@ -83,7 +83,6 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = hermesEnabled.toBoolean();
 
-
 def getCommitHash = { ->
     if (project.hasProperty("commitHash")) {
         return project.commitHash
@@ -138,11 +137,24 @@ def getEnvOrConfig = { varName ->
 android {
     ndkVersion rootProject.ext.ndkVersion
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17
+    }
+
+    // https://developer.android.com/studio/projects/install-ndk#vanilla_cmake
+    externalNativeBuild {
+        cmake {
+            // This version must match cmakeVersions inside nix/pkgs/android-sdk/compose.nix
+            version "3.22.1"
+        }
+    }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     namespace "im.status.ethereum"
@@ -194,10 +206,6 @@ android {
         doNotStrip '*/mips/*.so'
         doNotStrip '*/mips64/*.so'
     }
-    dexOptions {
-        jumboMode true
-        javaMaxHeapSize "8g"
-    }
     splits {
         abi {
             reset()
@@ -224,6 +232,7 @@ android {
         }
         release {
             minifyEnabled enableProguardInReleaseBuilds
+            shrinkResources enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             signingConfig null
         }
@@ -231,10 +240,10 @@ android {
             initWith release
             applicationIdSuffix ".pr"
             versionNameSuffix   ".pr"
-            debuggable          false
+            debuggable false
             matchingFallbacks = ["release"]
-             // necessary to make react-native-config's code generation work
-             resValue "string", "build_config_package", "im.status.ethereum"
+            // necessary to make react-native-config's code generation work
+            resValue "string", "build_config_package", "im.status.ethereum"
         }
     }
 
@@ -268,11 +277,14 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
     implementation("androidx.core:core-splashscreen:1.0.0")
-    // we don't use hermes for debug but we need its pom file for release builds
-    // https://github.com/status-im/status-mobile/pull/18675
-    implementation("com.facebook.react:hermes-android")
-    // FIXME: implementing both hermes & JSC increases bundle size by ~ 2MB
-    implementation(jscFlavor)
+
+    if (enableHermes) {
+        implementation("com.facebook.react:hermes-android")
+    } else {
+        // https://github.com/status-im/status-mobile/issues/18493
+        // we don't use hermes for debug builds because it crashes too often
+        implementation(jscFlavor)
+    }
 
     // react-native-screens
     implementation("androidx.appcompat:appcompat:1.1.0-rc01")
@@ -284,8 +296,9 @@ dependencies {
     implementation("com.github.status-im:function:0.0.1")
     implementation("com.facebook.fresco:fresco:2.5.0")
     implementation("com.facebook.fresco:animated-gif:2.5.0")
-    implementation("com.squareup.okhttp3:okhttp-tls:4.9.2")
+    implementation("com.squareup.okhttp3:okhttp-tls:4.11.0")
     implementation("com.google.prefab:cli:2.0.0")
+    implementation("com.android.tools.build:aapt2:8.1.1-10154469")
 }
 
 

android/app/proguard-rules.pro

@@ -58,6 +58,9 @@
 -keep interface okhttp3.** { *; }
 -dontwarn okhttp3.**
 
+# to fix : java.security.KeyStoreException: BKS not found
+-keep class org.bouncycastle.** { *; }
+
 # okio
 
 -keep class sun.misc.Unsafe { *; }
@@ -75,4 +78,13 @@
 -keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
   **[] $VALUES;
   public *;
-}
+}
+
+# react-native-config
+# https://github.com/lugg/react-native-config?tab=readme-ov-file#problems-with-proguard
+-keep class im.status.ethereum.BuildConfig {*;}
+
+# react-native-navigation
+# to fix : java.lang.ClassCastException: java.lang.Class cannot be cast to java.lang.reflect.ParameterizedType
+# at com.reactnativenavigation.views.element.animators.PropertyAnimatorCreator.getChildClass(Unknown Source:13)
+-keep class com.reactnativenavigation.** {*;}

android/app/src/debug/AndroidManifest.xml

@@ -3,11 +3,9 @@
           xmlns:tools="http://schemas.android.com/tools">
 
     <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
-    <uses-permission tools:node="remove" android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
     <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
 
-   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" >
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
+   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"  android:usesCleartextTraffic="true" />
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -2,8 +2,16 @@
           xmlns:tools="http://schemas.android.com/tools"
           android:installLocation="auto">
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.SEND_MULTIPLE" />
+            <data android:mimeType="*/*" />
+        </intent>
+    </queries>
+
     <!-- non-dangerous permissions -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -62,8 +70,30 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Handles http and https URLs for status.app -->
                 <data android:scheme="http" android:host="status.app" />
                 <data android:scheme="https" android:host="status.app" />
+                <!-- Community paths -->
+                <data android:pathPattern="/c/.*" android:host="status.app" android:scheme="http" />
+                <data android:pathPattern="/c/.*" android:host="status.app" android:scheme="https" />
+                <!-- Community channel paths -->
+                <data android:pathPattern="/cc/.*" android:host="status.app" android:scheme="http" />
+                <data android:pathPattern="/cc/.*" android:host="status.app" android:scheme="https" />
+                <!-- User paths -->
+                <data android:pathPattern="/u/.*" android:host="status.app" android:scheme="http" />
+                <data android:pathPattern="/u/.*" android:host="status.app" android:scheme="https" />
+                <!-- Private chat paths -->
+                <data android:pathPattern="/p/.*" android:host="status.app" android:scheme="http" />
+                <data android:pathPattern="/p/.*" android:host="status.app" android:scheme="https" />
+                <!-- Community request paths -->
+                <data android:pathPattern="/cr/.*" android:host="status.app" android:scheme="http" />
+                <data android:pathPattern="/cr/.*" android:host="status.app" android:scheme="https" />
+                <!-- Group chat paths -->
+                <data android:pathPattern="/g/.*" android:host="status.app" android:scheme="http" />
+                <data android:pathPattern="/g/.*" android:host="status.app" android:scheme="https" />
+                <!-- Wallet paths -->
+                <data android:pathPattern="/wallet/.*" android:host="status.app" android:scheme="http" />
+                <data android:pathPattern="/wallet/.*" android:host="status.app" android:scheme="https" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
@@ -74,7 +104,13 @@
             </intent-filter>
         </activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-        <service android:name="im.status.ethereum.pushnotifications.ForegroundService"></service>
+        <service
+            android:name="im.status.ethereum.pushnotifications.ForegroundService"
+            android:foregroundServiceType="specialUse">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="local notifications"/>
+        </service>
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

android/app/src/main/java/im/status/ethereum/MainActivity.kt

@@ -99,7 +99,7 @@ class MainActivity : NavigationActivity(), ActivityCompat.OnRequestPermissionsRe
 
     private fun tryToEmit(eventName: String, event: WritableMap) {
         try {
-                (getApplication() as MainApplication).getReactNativeHost()
+                (getApplication() as MainApplication).reactNativeHost
                 .getReactInstanceManager()
                 .getCurrentReactContext()
                 ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)

android/app/src/main/java/im/status/ethereum/MainApplication.kt

@@ -25,14 +25,13 @@ class MainApplication : NavigationApplication() {
             return BuildConfig.DEBUG
         }
 
-        override fun getPackages(): List<ReactPackage> {
-            val statusPackage = StatusPackage(RootUtil.isDeviceRooted())
-            val packages = PackageList(this).getPackages()
-            packages.add(statusPackage)
-            packages.add(RNStatusKeycardPackage())
-            packages.add(PushNotificationPackage())
-            packages.add(BlurViewPackage())
-            return packages
+        override fun getPackages(): List<ReactPackage> =
+            PackageList(this).packages.apply {
+          // Packages that cannot be autolinked yet can be added manually here
+          add(StatusPackage(RootUtil.isDeviceRooted()))
+          add(RNStatusKeycardPackage())
+          add(PushNotificationPackage())
+          add(BlurViewPackage())
         }
 
         override fun getJSMainModuleName(): String = "index"
@@ -42,9 +41,8 @@ class MainApplication : NavigationApplication() {
         override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
     }
 
-    override fun getReactNativeHost(): ReactNativeHost {
-        return mReactNativeHost
-    }
+    override val reactNativeHost: ReactNativeHost
+        get() = mReactNativeHost
 
     override fun onCreate() {
         super.onCreate()

android/build.gradle

@@ -15,6 +15,8 @@ ext {
     supportLibVersion   = project.supportLibVersion
     gradlePluginVersion = project.gradlePluginVersion
     kotlinVersion       = project.kotlinPluginVersion
+    kotlinPluginVersion = project.kotlinPluginVersion
+    kotlinToolsVersion  = project.kotlinPluginVersion
     ndkVersion = "25.2.9519653"
 }
 
@@ -28,6 +30,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinPluginVersion}"
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
 }
 
@@ -41,11 +44,30 @@ subprojects {
                 defaultConfig {
                     targetSdkVersion rootProject.ext.targetSdkVersion
                 }
+
+                // Speed up Tests Stage
+                tasks.withType(Test).configureEach {
+                    // https://docs.gradle.org/current/userguide/performance.html#execute_tests_in_parallel
+                    maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
+                    // https://docs.gradle.org/current/userguide/performance.html#fork_tests_into_multiple_processes
+                    forkEvery = 100
+                    // https://docs.gradle.org/current/userguide/performance.html#disable_reports
+                    reports.html.required = false
+                    reports.junitXml.required = false
+                }
+                // Speed up Java Compile Stage
+                // https://docs.gradle.org/current/userguide/performance.html#run_the_compiler_as_a_separate_process
+                tasks.withType(JavaCompile).configureEach {
+                    options.fork = true
+                }
+
             }
         }
     }
 }
 
+apply plugin: "com.facebook.react.rootproject"
+
 allprojects {
     beforeEvaluate {
         if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {

android/gradle.properties

@@ -22,9 +22,9 @@
 
 # Version requirements used throughout the Gradle scripts
 minSdkVersion=24
-compileSdkVersion=33
-targetSdkVersion=33
-buildToolsVersion=33.0.0
+compileSdkVersion=34
+targetSdkVersion=34
+buildToolsVersion=34.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/pkgs/aapt2/default.nix
 gradlePluginVersion=7.4.2
@@ -43,7 +43,7 @@ ANDROID_ABI_SPLIT=false
 # Some platforms are excluded though
 ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64
 
-org.gradle.jvmargs=-Xmx8704M
+org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC
 
 versionCode=9999
 commitHash=unknown

babel.config.js

@@ -1,19 +1,4 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
   plugins: ['react-native-reanimated/plugin', '@babel/plugin-transform-named-capturing-groups-regex'],
-  env: {
-    test: {
-      presets: [
-        '@babel/preset-react',
-        [
-          '@babel/preset-env',
-          {
-            targets: {
-              node: 'current',
-            },
-          },
-        ],
-      ],
-    },
-  },
 };

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -34,10 +34,10 @@ pipeline {
   }
 
   environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = "android${utils.isE2EBuild() ? "-e2e" : ""}"
+    LANG     = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    PLATFORM = "android${utils.isE2EBuild() ? "-e2e" : ""}"
     BUILD_ENV = 'prod'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1
@@ -71,7 +71,7 @@ pipeline {
         }
         stage('Upload') {
           steps { script {
-            def urls = apks.collect { s3.uploadArtifact(it) }
+            def urls = apks.collect { s5cmd.upload(it) }
             if (urls.size() > 1) { /* Return only the universal APK. */
               env.PKG_URL = urls.find { it.contains('universal') }
             } else { /* If no universal is available pick first. */

ci/Jenkinsfile.combined

@@ -1,5 +1,7 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
+
+import groovy.json.JsonBuilder
 
 pipeline {
   agent { label 'linux' }
@@ -72,7 +74,7 @@ pipeline {
           iOS: utils.pkgUrl(ios),
           Diawi: utils.getEnv(ios, 'DIAWI_URL'),
           /* upload the sha256 checksums file too */
-          SHA: s3.uploadArtifact(sha),
+          SHA: s5cmd.upload(sha),
         ]
         /* add URLs to the build description */
         jenkins.setBuildDesc(urls)
@@ -81,9 +83,9 @@ pipeline {
     stage('Publish') {
       when { expression { params.PUBLISH } }
       steps { script {
-        switch (btype) {
+        switch (utils.getBuildType()) {
           case 'nightly': /* Create JSON file with newest build URLs */
-            s3.updateBucketJSON(urls, 'latest.json');
+            updateBucketJSON(urls, 'latest.json');
             break;
           case 'release':
             github.publishReleaseFiles(repo: 'status-mobile');
@@ -114,3 +116,22 @@ def Boolean getPublishDefault(Boolean previousValue) {
   if (previousValue != null) { return previousValue }
   return false
 }
+
+/* Helper for updating JSON with newest builds. */
+def updateBucketJSON(urls, fileName) {
+  /* latest.json has slightly different key names */
+  def content = [
+    DIAWI: urls.Diawi,
+    APK: urls.Apk, IOS: urls.iOS,
+    APP: urls.App, MAC: urls.Mac,
+    WIN: urls.Win, SHA: urls.SHA
+  ]
+  def filePath = "${pwd()}/pkg/${fileName}"
+  /* it might not exist */
+  sh "mkdir -p ${pwd()}/pkg"
+  def contentJson = new JsonBuilder(content).toPrettyString()
+  println "${filePath}:\n${contentJson}"
+  writeFile(file: filePath, text: contentJson)
+  return s5cmd.upload(filePath)
+}
+

ci/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -34,10 +34,10 @@ pipeline {
   }
 
   environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'ios'
+    LANG     = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    PLATFORM = 'ios'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1
     BUNDLE_PATH = "${HOME}/.bundle"

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -29,67 +29,53 @@ pipeline {
       description: 'Specify build type. Values: pr / e2e / nightly / release',
       defaultValue: 'pr',
     )
+    booleanParam(
+      name: 'RUN_CONTRACT_TESTS',
+      description: 'Whether to run optional and slow contract tests.',
+      defaultValue: false,
+    )
   }
 
   environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'tests'
+    LANG     = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    PLATFORM = 'tests'
     BUILD_ENV = 'prod'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     LOG_FILE = utils.pkgFilename(ext: 'log', arch: 'tests')
+    CLJ_LINTER_PRINT_WARNINGS = 'true'
   }
 
   stages {
-    stage('Checks') {
+    stage('Test') {
       parallel {
         stage('Lint') {
-          steps {
-            sh """#!/bin/bash
-              set -eo pipefail
-              make lint CLJ_LINTER_PRINT_WARNINGS=true 2>&1 | tee ${LOG_FILE}
-            """
-          }
+          steps { make('lint') }
         }
-        stage('Unit Tests') {
-          steps {
-            sh """#!/bin/bash
-              set -eo pipefail
-              make test-unit 2>&1 | tee -a ${LOG_FILE}
-            """
-          }
+        stage('Unit') {
+          steps { make('test-unit') }
+        }
+        stage('Component') {
+          steps { make('test-component') }
         }
       }
     }
-    stage('Contract Tests') {
-      steps {
-        sh """#!/bin/bash
-          set -eo pipefail
-          make test-contract 2>&1 | tee -a ${LOG_FILE}
-        """
-      }
-    }
-    stage('Integration Tests') {
-      steps {
-        sh """#!/bin/bash
-          set -eo pipefail
-          make test-integration 2>&1 | tee -a ${LOG_FILE}
-        """
-      }
-    }
-    stage('Component Tests') {
-      steps {
-        sh """#!/bin/bash
-          set -eo pipefail
-          make component-test 2>&1 | tee -a ${LOG_FILE}
-        """
+    stage('Heavy Test') {
+      parallel {
+        stage('Contract') {
+          when { expression { params.RUN_CONTRACT_TESTS } }
+          steps { make('test-contract') }
+        }
+        stage('Integration') {
+          steps { make('test-integration') }
+        }
       }
     }
     stage('Upload') {
       steps {
         script {
-          env.PKG_URL = s3.uploadArtifact(LOG_FILE)
+          env.PKG_URL = s5cmd.upload(LOG_FILE)
         }
       }
     }
@@ -100,3 +86,10 @@ pipeline {
     always  { sh 'make purge' }
   }
 }
+
+def make(target) {
+  sh """#!/bin/bash
+    set -eo pipefail
+    make ${target} 2>&1 | tee -a ${LOG_FILE}
+  """
+}

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 pipeline {
 
@@ -36,6 +36,12 @@ pipeline {
     ))
   }
 
+  environment {
+    /* Avoid race conditions with other builds using virtualenv. */
+    VIRTUAL_ENV = "${WORKSPACE_TMP}/venv"
+    PATH = "${VIRTUAL_ENV}/bin:${PATH}"
+  }
+
   stages {
     stage('Fetch') {
       steps { script {
@@ -52,7 +58,8 @@ pipeline {
     stage('Setup') {
       steps { script {
         dir('test/appium') {
-          sh 'pip3 install --user -r requirements.txt'
+          sh "python3 -m venv ${VIRTUAL_ENV}"
+          sh 'pip3 install -r requirements.txt'
         }
       } }
     }

ci/tests/Jenkinsfile.e2e-prs

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 pipeline {
 
@@ -54,6 +54,12 @@ pipeline {
     ))
   }
 
+  environment {
+    /* Avoid race conditions with other builds using virtualenv. */
+    VIRTUAL_ENV = "${WORKSPACE_TMP}/venv"
+    PATH = "${VIRTUAL_ENV}/bin:${PATH}"
+  }
+
   stages {
     stage('Prep') {
       steps { script {
@@ -79,7 +85,8 @@ pipeline {
     stage('Setup') {
       steps { script {
         dir('test/appium') {
-          sh 'pip3 install --user -r requirements.txt'
+          sh "python3 -m venv ${VIRTUAL_ENV}"
+          sh 'pip3 install -r requirements.txt'
         }
       } }
     }

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 pipeline {
 
@@ -35,6 +35,11 @@ pipeline {
     ))
   }
 
+  environment {
+    /* Avoid race conditions with other builds using virtualenv. */
+    VIRTUAL_ENV = "${WORKSPACE_TMP}/venv"
+    PATH = "${VIRTUAL_ENV}/bin:${PATH}"
+  }
 
   stages {
     stage('Prep') {
@@ -51,7 +56,8 @@ pipeline {
     stage('Setup') {
       steps { script {
         dir('test/appium') {
-          sh 'pip3 install --user -r requirements.txt'
+          sh "python3 -m venv ${VIRTUAL_ENV}"
+          sh 'pip3 install -r requirements.txt'
         }
       } }
     }

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,14 +1,14 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 pipeline {
   agent { label 'macos' }
 
   environment {
-    LANG      = 'en_US.UTF-8'
-    LANGUAGE  = 'en_US.UTF-8'
-    LC_ALL    = 'en_US.UTF-8'
-    TARGET    = 'ios'
+    LANG     = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    PLATFORM = 'ios'
     FASTLANE_DISABLE_COLORS = 1
     /* avoid writing to r/o /nix */
     GEM_HOME  = '~/.rubygems'

ci/tools/Jenkinsfile.nix-cache

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 pipeline {
   agent { label params.AGENT_LABEL }
@@ -123,7 +123,6 @@ pipeline {
   post {
     always { script {
       nix.shell('nix-store --optimize', pure: false)
-      nix.shell('nix/scripts/clean.sh', pure: false)
     } }
   }
 }

ci/tools/Jenkinsfile.playstore-meta

@@ -1,14 +1,14 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 pipeline {
   agent { label 'linux' }
 
   environment {
-    LANG      = 'en_US.UTF-8'
-    LANGUAGE  = 'en_US.UTF-8'
-    LC_ALL    = 'en_US.UTF-8'
-    TARGET    = 'ios'
+    LANG     = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    PLATFORM = 'ios'
     FASTLANE_DISABLE_COLORS = 1
     /* avoid writing to r/o /nix */
     GEM_HOME  = '~/.rubygems'

ci/tools/Jenkinsfile.xcode-clean

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.9.1'
 
 pipeline {
   agent {

doc/component-tests-overview.md

@@ -16,10 +16,10 @@ Both of these links are showing it for React-Testing-Library (not Native) howeve
 ## Running the tests
 To run these tests there are two methods.
 
-`make component-test` 
+`make test-component`
 setups and runs the test suite once.
 
-`make component-test-watch` 
+`make test-component-watch`
 setups and runs the test suite and watches for code changes will then retrigger the test suite.
 
 ## Writing Tests
@@ -38,7 +38,7 @@ There is a file of utility functions defined in "src/test_helpers/component.cljs
 ## Configuration
 Status Mobile has a bespoke tech stack, as such there is more complexities to configuring the tests.
 
-### Shadow-CLJS 
+### Shadow-CLJS
 the configuration for compiling our tests are defined in the "shadow-cljs.edn" file.
 The three main parts of this are
 `:target :npm-module`
@@ -47,9 +47,9 @@ Needed for the configuration we are using
 a vector of entry points for the test files.
 and the `ns-regexp` to specify what tests to find. Since we have multiple forms of tests we decided that "component-spec" is the least likely to detect the wrong file type.
 
-It's worth knowing that our tests are compiled to JS and then run in the temporary folder `component-tests`. 
+It's worth knowing that our tests are compiled to JS and then run in the temporary folder `component-tests`.
 
 ### Jest
 There is also further configuration for Jest in "test/jest". There is a jest config file which has some mostly standard configuration pieces, where the tests live, what environment variables are set etc. This is documented by Jest here: https://jestjs.io/docs/configuration
 
-There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies 
+There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies.

doc/debugging.md

@@ -20,6 +20,39 @@ A server will be started at http://localhost:4567. It might show "not connected"
 
 More details about re-frisk are on the [project page](https://github.com/flexsurfer/re-frisk).
 
+## Debugging with FlowStorm
+
+[FlowStorm](http://www.flow-storm.org/) is a free and open-source time-travel
+debugger for Clojure and ClojureScript. It is capable of recording almost any
+code execution path in the Status' mobile app.
+
+FlowStorm is independent of editor/IDE, but a tighter [integration with
+Emacs](https://github.com/jpmonettas/cider-storm) is available.
+
+If you are developing with Android, run `make android-ports` first. If you are
+behind a firewall, allow TCP traffic on port `7722`, then:
+
+```bash
+make run-flow-storm
+```
+
+You will know FlowStorm is correctly running if you see the status bar with
+green `REPL` and `RUNTIME` indicators.
+
+With FlowStorm running, you can now add `#trace` on any top-level form, reload
+the code, or evaluate the traced form in the REPL, and FlowStorm will start
+recording data. Avoid `#rtrace` (with `r`) because it can cause massive spikes
+in CPU which will make the app hang and you might need to forcefully kill
+processes.
+
+```clojure
+#trace ; => Add this line to tell FlowStorm to instrument the function.
+(defn say-hello []
+  (str "Hello world"))
+```
+
+There are other ways to debug, but this is a good start.
+
 ## Enabling debug logs
 Calls to `log/debug` will not be printed to the console by default. It can be enabled under "Advanced settings" in the app:
 

doc/dependencies.md

@@ -20,12 +20,6 @@ required by bignumber.js otherwise there is a compilation error
 
 used to generate guids and random values in `status-im.utils.random`
 
-## "create-react-class": "15.6.2"
-
-fixed version because even bugfix update causes compilation error with current version of react-native (0.59)
-
-internal react library, used by figwheel for instance but also probably react
-
 ## "emojilib": "^2.4.0"
 
 used for emojis
@@ -113,11 +107,6 @@ used for profile picture
 used for storing password when user saves password
 TODO: check if fork is necessary, merge with upstream?
 
-## "react-native-languages": "^3.0.2"
-
-TODO DEPRECATED, should be replaced with https://github.com/react-native-community/react-native-localize
-used to get user language and interact with i18n.js
-
 ## "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#v3.0.8_status"
 
 used to send email to support when phone is shaked
@@ -131,6 +120,7 @@ TODO: update once bug is fixed for Android that causes crash when app is back fr
 ## "react-native-shake": "^3.3.1"
 
 used to send email to support when phone is shaked
+
 ## "react-native-lottie-splash-screen": "^1.0.1"
 
 used to make splash screen with lottie animation during initial loading for android, also used as replacement of "react-native-splash-screen" for iOS
@@ -157,10 +147,10 @@ used for browser
 used for native navigation
 fixed because even bugfix version upgrade causes runtime errors with current version of react-native
 
-## "rn-emoji-keyboard": "https://github.com/status-im/rn-emoji-keyboard"
-
-Used for taking emoji input, for custom emoji thumbnails for community channels
-
 ## "react-native-draggable-flatlist": "https://github.com/computerjazz/react-native-draggable-flatlist"
 
 A drag-and-drop-enabled FlatList component for React Native
+
+## "react-native-shadow-2": "https://github.com/SrBrahma/react-native-shadow-2"
+
+A shadow component that is consistent across both platforms

doc/merging-pr-process.md

@@ -32,14 +32,16 @@ status-mobile code that makes it to the `develop` branch, should always point to
 In practice, this means that sometimes they need to be merged in lockstep.
 1) Create a PR in status-go and status-mobile. Update the status-go version to the PR revision `scripts/update-status-go.sh $git_revision`.
 2) Get both PRs reviewed and approved. Once status-mobile PR has been approved, go through manual QA testing if necessary. Don't merge status-mobile PR just yet.
-3) Now that you know the integration between client & server is working, bump the `VERSION` in status-go and merge it.
-4) Once merged, tag the version with the new version and push the tag:
+3) Now that you know the integration between client & server is working, merge the status-go PR first.
+4) Once merged, tag the merged commit with the new version and push the tag:
 ```
   git checkout develop
   git pull develop
-  git tag vx.y.z
+  make tag-version
   git push origin vx.y.z
 ```
+:warning: If a specific commit need to tagged in status-go, use `make tag-version TARGET_COMMIT={hash}`. More info about tagging in [status-go](https://github.com/status-im/status-go/blob/develop/RELEASING.md#tagging-versions).
+
 5) Update status-mobile with the new status-go version, using the new tag `scripts/update-status-go.sh "vx.y.z"`
 6) If you had to rebase status-go to include new changes, e2e test MUST be re-run. If there's any issue you will
    have to fix in status-go with another PR and follow the same process.

doc/pipeline_process.md

@@ -2,46 +2,80 @@
 
 [Pipeline for QA](https://github.com/status-im/status-mobile/projects/7) is a project board for developers and testers used to track the status of a pull request, get reviews and manual testing, and run autotests.
 
-The generally accepted recommendations for its use are described below:
+The generally accepted requirements for its use are described below:
 
 ## Opening a PR
 - Once a PR is created, it moves to the ```REVIEW``` column where a review will be requested automatically.
 - You can also request a review inside the PR from a particular person if needed.
 - When creating a PR, do not forget to assign it to yourself.
-- Also in case the PR adds new functionality, a short description would be appreciated.
+- Also in case the PR adds new functionality, a description **MUST** be added.
 
 ### What if the work is still in progress?
 
 - If PR work is not finished yet, please mark it as a draft or add [WIP] to the title and keep it in the `CONTRIBUTOR` column until it's ready to be reviewed/tested.
+- Alternatively, you can open a `draft`.
+
+### When is a PR considered ready to move forward?
+
+Ready for testing, a PR should meet the following criteria:
+
+1. Reviewed and has at least 1 approval.
+2. Rebased to the `develop` branch (both `status-mobile` and `status-go` if needed, depending on what part has changes).
+   - **NOTE:** QAs can use the `Update with rebase` button from GitHub if:
+        - The PR has no `status-go` changes.
+        - The PR has no conflict with the develop branch.
+3. All possible conflicts have been resolved.
+4. Has the label: `request-manual-qa` or `skip-manual-qa`.
+5. PRs **MUST** identify what area is affected and should have a description.
 
 
-### When is a PR considered to be Ready for testing by QA team? 


-Ready for testing PR should meet the following criteria: 
+### E2E tests and analyzing the results
 
-1. Reviewed and has at least 1 approval
-2. Rebased to `develop` branch (both `status-mobile` and `status-go` if needed, depending on what part has changes) 
-3. All possible conflicts have been resolved 
-4. Has the label: `request-manual-qa`
+The PR **MUST** be moved to the E2E column when it is ready for testing (**mandatory for all PRs**).
+That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
+This step cannot be skipped. So, at least one comment from the `status-im-auto` bot with results is a prerequisite for moving forward.
+Information on how to analyze tests can be found [here](https://github.com/status-im/status-mobile/blob/develop/doc/how-to-launch-e2e.md).
+Tests might be flaky, as they depend on infrastructure - SauceLabs and Waku.
 
-**From the perspective of a developer it means that once work on PR is finished:**
+If there are `Failed tests` and you are not sure about the reason, you can always ping the mobile QAs for help (preferably in PRs by `@status-im/mobile-qa`).
 
-1. It should be rebased to the latest `develop`. If there are conflicts - they should be resolved if possible.
-2. If the PR was in the `Contributor` column - it should be moved to `Review` column.
-3. Wait for the review.
-4. Make sure that after review and before requesting manual QA your PR is rebased to current develop.
-5. Once the PR has been approved by reviewer(s) - label `request-manual-qa` should be applied to the PR
-6. Move PR to the E2E column when it is ready for testing (**mandatory for all PRs**). That will also trigger e2e tests run. QAs are monitoring PRs from E2E column and take it into test. 
-
-After that - PR will be taken into manual testing by the QA team.
+**For now, it is the only reliable source of regression in the app because, due to time constraints, it is not possible to test thoroughly each PR.
+Please, respect this rule.**
 
 ## Testing PR
 
+### Adding `skip-manual-qa`
+
+**Do not hesitate to use a `skip-manual-qa`** if you're sure that it is a simple flow and you checked it. 
+- Please ask another team member before adding the `skip-manual-qa` label (PR/Status community/DMs) so that there's a second opinion.
+- The PR MUST have a proper reasoning why manual QA is skipped.
+- The PR MUST include the steps of testing that has been done by the developer prior to moving it forward.
+
+**NOTE:** Make sure that QAs are OK with that;
+
+Before merging PRs, please make sure that information is added about how you tested the PRs, that e2s have been passed and their results have been reviewed. 
+
+The QA team appreciates your help!
+
+
 ### Manual testing
-- If you think PR needs and is ready for manual testing, please add the ```request-manual-qa``` label. 
+
+#### Prerequisites for manual testing
+1. PR has a description of the change and details the area of the application affected by the change.
+2. PR has automation results from the previous E2E test run step.
+3. PR includes a demo, test steps, and any possible regression(s)
+4. If appropriate, PR details what elements of a feature are out of scope.
+
+**If one of the prerequisites is missing, the PR will be moved to the contributor folder with a corresponding comment.**
+
+- If you think a PR needs and is ready for manual testing, please add the `request-manual-qa` label.
 - QA engineer picks up one of PRs with the ```request-manual-qa``` label, drags the item to the ```IN TESTING``` column and assigns it to themselves.
 - During testing, QA will add comments describing the issues found, and also review automation tests results.
 Usually found issues are numbered as "Issue 1, Issue 2", etc.
-When the first round of testing is completed and all issues for this stage are found, the QA can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional.
+When the first round of testing is completed and all issues for this stage are found, the QA can add the ```Tested - Issues``` label and drag the card to the ```CONTRIBUTOR``` column. These two actions are optional. 
+
+**IMPORTANT NOTE:** when the issues are fixed, developer **MUST** notify the QA that it is ready to be re-tested again by mention them in the PR.
+
 - When manual testing of the PR is fully completed and all the issues are fixed, the QA adds the ```Tested - OK``` label and drags the card to the ```Design review``` column (the cases when design review is necessary are described below).
 - If design review is not required, the QA drags the PR to the ```MERGE``` column. After that the developer merges PR into develop.
 - If design review has been done, the designer (```@Francesca-G```) drags the PR to the ```MERGE``` column.
@@ -64,11 +98,11 @@ There are three possible scenarios when the design review is completed:
 ---
 **Notes:**
 - If your PR has a long story and started from `develop` branch several days ago, please rebase it to current develop before adding label
-- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality.
+- if PR can be tested by developer (in case of small changes) and/or developer is sure that the changes made cannot introduce a regression, then PR can be merged without manual testing. Also, currently, PRs are not manually tested if the changes relate only the design (creation of components, etc.) and do not affect the functionality (see `skip-manual-qa` label)
 ---        
 
 #### Why my PR is in `Contributor` column?
-PR can be moved to this column by the ```status-github-bot``` or by QA engineer with label `Tested-issues`.
+PR can be moved to this column by the ```status-github-bot``` or by QA engineer with label `Tested-issues` or if one of the requirements for manual QA was not met.
 In the first case most often this happens due to conflicting files in PR.
 In the second case - after fixing of all found issues, the developer should ping the QA in the PR comments for retesting.
 
@@ -86,7 +120,6 @@ In the second case - after fixing of all found issues, the developer should ping
 6. In case of manual testing - the label ```Tested - OK``` from QA
 7. In case of design review - the approval from the designer
 
-
 You can merge your PR into develop - some useful clues you can find [here](https://notes.status.im/setup-e2e#3-Merging-PR) 
 
 HAPPY DEVELOPMENT! :tada: 

doc/release-guide.md

@@ -51,6 +51,8 @@ Jenkins will automatically build this branch and create release candidates.
 Those will go through the QA process and the QA team will let us know when
 tested successfully.
 
+You can see the state at https://ci.infra.status.im/ -> status-mobile -> release -> pick the right version number
+
 ## Bugfixes before an app is released
 
 Because both `status-mobile` and `status-go` might have newer commits that we don't want to include, bug fixes should be applied separately to develop and the release branch.

doc/testing.md

@@ -54,13 +54,13 @@ Here I'm showing a terminal-only experience using Tmux (left pane Emacs, right p
 To run tests:
 
 ```
-make component-test
+make test-component
 ```
 
 Also test watcher can be launched. It will re-run the entire test suite when any file is modified
 
 ```
-make component-test-watch
+make test-component-watch
 ```
 
 Check [component tests doc](./component-tests-overview.md) for more.

doc/troubleshooting.md

@@ -128,3 +128,19 @@ Status-mobile uses `shadow-cljs` for hot reloading changes and uses its own [rel
 
 ### Solution
 Open react native's [In-App Developer Menu](https://reactnative.dev/docs/debugging#accessing-the-in-app-developer-menu) and press "Disable Fast Refresh" or "Disable Hot Reloading"
+
+# App crashing after running `make run-ios`
+
+### Cause
+It's possible that installing XCode from a `.xip` file might cause XCode to act funny
+Since it's not installed from the App Store, Or you might be missing a Rosetta installation.
+
+[Reference/Similar issue](https://github.com/expo/expo-cli/issues/3197)
+
+You might see something like this after running `make run-ios`:
+```
+Underlying error (domain=FBSOpenApplicationServiceErrorDomain, code=1):
+```
+### Solution
+Run `softwareupdate --install-rosetta --agree-to-license`
+to accept XCode's license and install Rosetta.

doc/ui-guidelines.md

@@ -31,7 +31,7 @@ NOW:
 (defn view
   [{:keys [on-press on-long-press icon]}]
   (let [[pressed? set-pressed] (rn/use-state false)
-        theme                  (theme/use-theme-value)
+        theme                  (theme/use-theme)
         on-press-in            (rn/use-callback #(set-pressed true))
         on-press-out           (rn/use-callback #(set-pressed nil))]
     [rn/pressable
@@ -47,7 +47,7 @@ NOW:
 - We no longer need to create an anonymous function for rendering. This removes unnecessary confusion and the need for specific knowledge on how it works and why it was needed.
 - `rn/use-state` is used instead of `reagent/atom`
 - State values no longer need to be dereferenced; they are accessible as regular symbols. This eliminates a common bug where the "@" symbol was inadvertently omitted.
-- `theme/with-theme` wrapper is not needed anymore, `(theme/use-theme-value)` hook can be used directly in the components
+- `theme/with-theme` wrapper is not needed anymore, `(theme/use-theme)` hook can be used directly in the components
 - `:f>` not needed anymore, all components are functional by default
 - `rn/use-callback` hook should be used for anon callback functions
 

fastlane/Fastfile

@@ -164,7 +164,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',
+    buildlog_path: 'logs',
     # -------------------------------------
     # Normal stuff
     scheme: 'StatusIm',
@@ -231,7 +231,7 @@ platform :ios do
       clean: true,
       export_method: 'app-store',
       output_directory: 'status-ios',
-      buildlog_path: 'ios/logs',
+      buildlog_path: 'logs',
       include_symbols: false,
       export_options: {
         "combileBitcode": true,

fastlane/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
 gem 'fastlane', '>= 2.131.0'

fastlane/Gemfile.lock

@@ -3,25 +3,30 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.4)
+    activesupport (7.0.8)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.768.0)
-    aws-sdk-core (3.173.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.872.0)
+    aws-sdk-core (3.190.1)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.64.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-kms (1.75.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.122.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+    aws-sdk-s3 (1.141.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -29,14 +34,14 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    concurrent-ruby (1.2.2)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.99.0)
+    excon (0.108.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -66,7 +71,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.212.2)
+    fastlane (2.217.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -87,10 +92,11 @@ GEM
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
       optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
@@ -98,7 +104,7 @@ GEM
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -106,9 +112,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.42.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -121,26 +127,26 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
+    google-cloud-env (2.1.0)
+      faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.45.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-storage_v1 (~> 0.29.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.9.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -148,32 +154,34 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.0)
-    memoist (0.16.2)
+    json (2.7.1)
+    jwt (2.7.1)
     mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
+    minitest (5.20.0)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
     optparse (0.1.1)
     os (1.1.4)
     plist (3.7.0)
-    public_suffix (5.0.1)
-    rake (13.0.6)
+    public_suffix (5.0.4)
+    rake (13.1.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.17.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -182,21 +190,20 @@ GEM
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.23.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -209,10 +216,12 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
+  x86_64-darwin-22
 
 DEPENDENCIES
+  activesupport (>= 6.1.7.3, < 7.1.0)
   fastlane (>= 2.131.0)
 
 BUNDLED WITH
-   2.3.9
+   2.4.13

fastlane/gemset.nix

@@ -1,14 +1,25 @@
 {
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5";
+      type = "gem";
+    };
+    version = "7.0.8";
+  };
   addressable = {
     dependencies = ["public_suffix"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20";
+      sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
       type = "gem";
     };
-    version = "2.8.4";
+    version = "2.8.6";
   };
   artifactory = {
     groups = ["default"];
@@ -35,20 +46,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz";
+      sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   aws-partitions = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1256rf6zjh3canwr636w7yczbvhh72cpz2fw5ixljbh4fcfkrvlm";
+      sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm";
       type = "gem";
     };
-    version = "1.768.0";
+    version = "1.872.0";
   };
   aws-sdk-core = {
     dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -56,10 +67,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10djgbz4k9w3axka8xrhf97h9yh9svi5g5xvncfwnkg6h22w2177";
+      sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh";
       type = "gem";
     };
-    version = "3.173.0";
+    version = "3.190.1";
   };
   aws-sdk-kms = {
     dependencies = ["aws-sdk-core" "aws-sigv4"];
@@ -67,10 +78,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
+      sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1";
       type = "gem";
     };
-    version = "1.64.0";
+    version = "1.75.0";
   };
   aws-sdk-s3 = {
     dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@@ -78,10 +89,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx";
+      sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya";
       type = "gem";
     };
-    version = "1.122.0";
+    version = "1.141.0";
   };
   aws-sigv4 = {
     dependencies = ["aws-eventstream"];
@@ -89,10 +100,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
+      sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.8.0";
   };
   babosa = {
     groups = ["default"];
@@ -156,6 +167,16 @@
     };
     version = "4.6.0";
   };
+  concurrent-ruby = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
   declarative = {
     groups = ["default"];
     platforms = [];
@@ -172,21 +193,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1czaak53w8n13y1fr0q23gp0fhklvxjac5n562qj3xk6sh5ad0x2";
+      sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w";
       type = "gem";
     };
-    version = "0.6.4";
+    version = "0.6.5";
   };
   domain_name = {
-    dependencies = ["unf"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
+      sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si";
       type = "gem";
     };
-    version = "0.5.20190701";
+    version = "0.6.20231109";
   };
   dotenv = {
     groups = ["default"];
@@ -213,10 +233,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
+      sha256 = "1q9yz7x36mpzpz04bg6hdyrzzk4bri9jg3h2ygw26bf6v3axq53q";
       type = "gem";
     };
-    version = "0.99.0";
+    version = "0.108.0";
   };
   faraday = {
     dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
@@ -363,15 +383,15 @@
     version = "2.2.7";
   };
   fastlane = {
-    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "http-cookie" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15sa3v3aaslympg9nmadmpxpbzykdiybzxn3navc7mf0iscb3q7s";
+      sha256 = "0p2b92csayzlj60v15fz3mq4h23kvvr7swhaavi6fpaqzf70iafi";
       type = "gem";
     };
-    version = "2.212.2";
+    version = "2.217.0";
   };
   gh_inspector = {
     groups = ["default"];
@@ -389,10 +409,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ks2ak4fcvlflhyinykvd88g2ybxwsbc347aww349zhn1mqprbvg";
+      sha256 = "046j100lrh5dhb8p3gr38fyqrw8vcif97pqb55ysipy874lafw49";
       type = "gem";
     };
-    version = "0.42.0";
+    version = "0.54.0";
   };
   google-apis-core = {
     dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"];
@@ -400,10 +420,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "184zkm5agi7r5fl79hgahjpydsc4d23nd2ynh2sr9z8gs2w4h82f";
+      sha256 = "1cly6ycryjhk15d60v3nqvhqpjk9f0nznnslbdnin90f5r54sbpd";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.11.2";
   };
   google-apis-iamcredentials_v1 = {
     dependencies = ["google-apis-core"];
@@ -433,10 +453,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17qamcjnf22zvw1g169g8a2gkzdsxx4ij3a4ganihyrcf9r62asj";
+      sha256 = "1k432qgxf41c4m6d68rascm0gyj18r7ypmrnyzmxh7k7nh543awx";
       type = "gem";
     };
-    version = "0.19.0";
+    version = "0.29.0";
   };
   google-cloud-core = {
     dependencies = ["google-cloud-env" "google-cloud-errors"];
@@ -444,10 +464,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za";
+      sha256 = "00wfvdvdv9m4l5ydn6xp65n68mgmpqr3n09hzvxs7gp8fly3j17v";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "1.6.1";
   };
   google-cloud-env = {
     dependencies = ["faraday"];
@@ -455,10 +475,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
+      sha256 = "056r1p8vhjswnx2cy3mzhwc5gj03whmpz8m4p2ph37gag5bpnxmf";
       type = "gem";
     };
-    version = "1.6.0";
+    version = "2.1.0";
   };
   google-cloud-errors = {
     groups = ["default"];
@@ -476,21 +496,21 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1skhlpcykxxzw3050cwngdyc3n746wfx443w1w9chxwjbh2ix6i9";
+      sha256 = "0033bi8qwm0ksxsv5zhz4nzwsiaapq3xk79z8f8rx3v09vdap07j";
       type = "gem";
     };
-    version = "1.44.0";
+    version = "1.45.0";
   };
   googleauth = {
-    dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"];
+    dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis";
+      sha256 = "0spv89di017rg25psiv4w3pn6f67y2w6vv8w910i83b5yii84rl1";
       type = "gem";
     };
-    version = "1.5.2";
+    version = "1.9.1";
   };
   highline = {
     groups = ["default"];
@@ -523,6 +543,17 @@
     };
     version = "2.8.3";
   };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
+      type = "gem";
+    };
+    version = "1.14.1";
+  };
   jmespath = {
     groups = ["default"];
     platforms = [];
@@ -538,30 +569,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
+      sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq";
       type = "gem";
     };
-    version = "2.6.3";
+    version = "2.7.1";
   };
   jwt = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
+      sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87";
       type = "gem";
     };
-    version = "2.7.0";
-  };
-  memoist = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55";
-      type = "gem";
-    };
-    version = "0.16.2";
+    version = "2.7.1";
   };
   mini_magick = {
     groups = ["default"];
@@ -578,10 +599,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5";
+      sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.1.5";
+  };
+  minitest = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3";
+      type = "gem";
+    };
+    version = "5.20.0";
   };
   multi_json = {
     groups = ["default"];
@@ -598,10 +629,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.3.0";
   };
   nanaimo = {
     groups = ["default"];
@@ -658,20 +689,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35";
+      sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
       type = "gem";
     };
-    version = "5.0.1";
+    version = "5.0.4";
   };
   rake = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
+      sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
       type = "gem";
     };
-    version = "13.0.6";
+    version = "13.1.0";
   };
   representable = {
     dependencies = ["declarative" "trailblazer-option" "uber"];
@@ -699,10 +730,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
       type = "gem";
     };
-    version = "3.2.5";
+    version = "3.2.6";
   };
   rouge = {
     groups = ["default"];
@@ -750,10 +781,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x";
+      sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6";
       type = "gem";
     };
-    version = "0.17.0";
+    version = "0.18.0";
   };
   simctl = {
     dependencies = ["CFPropertyList" "naturally"];
@@ -782,10 +813,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk";
+      sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "3.0.2";
   };
   trailblazer-option = {
     groups = ["default"];
@@ -812,10 +843,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235";
+      sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.8.2";
   };
   tty-spinner = {
     dependencies = ["tty-cursor"];
@@ -828,6 +859,17 @@
     };
     version = "0.9.3";
   };
+  tzinfo = {
+    dependencies = ["concurrent-ruby"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
+      type = "gem";
+    };
+    version = "2.0.6";
+  };
   uber = {
     groups = ["default"];
     platforms = [];
@@ -838,36 +880,15 @@
     };
     version = "0.1.0";
   };
-  unf = {
-    dependencies = ["unf_ext"];
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
-      type = "gem";
-    };
-    version = "0.1.4";
-  };
-  unf_ext = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch";
-      type = "gem";
-    };
-    version = "0.0.8.2";
-  };
   unicode-display_width = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2";
+      sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "2.5.0";
   };
   webrick = {
     groups = ["default"];
@@ -895,10 +916,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi";
+      sha256 = "176ndahc5fssyx04q176vy6wngs1av4vrsdrkdpjij700hqll8hn";
       type = "gem";
     };
-    version = "1.22.0";
+    version = "1.23.0";
   };
   xcpretty = {
     dependencies = ["rouge"];

ios/Podfile

@@ -1,13 +1,28 @@
-# Resolve react_native_pods.rb with node to allow for hoisting
-require Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-    "react-native/scripts/react_native_pods.rb",
-    {paths: [process.argv[1]]},
-  )', __dir__]).strip
+def node_require(script)
+   # Resolve script with node to allow for hoisting
+   require Pod::Executable.execute_command('node', ['-p',
+     "require.resolve(
+       '#{script}',
+       {paths: [process.argv[1]]},
+     )", __dir__]).strip
+end
+
+node_require('react-native/scripts/react_native_pods.rb')
+node_require('react-native-permissions/scripts/setup.rb')
 
 platform :ios, min_ios_version_supported
 prepare_react_native_project!
 
+setup_permissions([
+  'Camera',
+  'FaceID',
+  'MediaLibrary',
+  'Microphone',
+  'Notifications',
+  'PhotoLibrary',
+  'PhotoLibraryAddOnly',
+])
+
 linkage = ENV['USE_FRAMEWORKS']
 if linkage != nil
   Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
@@ -32,8 +47,8 @@ abstract_target 'Status' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    :hermes_enabled => false,
     :fabric_enabled => flags[:fabric_enabled],
+    :hermes_enabled => true,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
@@ -43,9 +58,6 @@ abstract_target 'Status' do
 
   pod 'SSZipArchive', '2.4.3'
 
-  permissions_path = '../node_modules/react-native-permissions/ios'
-  pod 'Permission-Microphone', :path => "#{permissions_path}/Microphone/Permission-Microphone.podspec"
-  pod 'Permission-Camera', :path => "#{permissions_path}/Camera/Permission-Camera.podspec"
   pod "react-native-status-keycard", path: "../node_modules/react-native-status-keycard"
   pod "react-native-status", path: "../modules/react-native-status"
   pod "Keycard", git: "https://github.com/status-im/Keycard.swift.git"
@@ -63,15 +75,18 @@ abstract_target 'Status' do
   end
 
   post_install do |installer|
+    # as per react-native 0.73.2 template
+    # https://github.com/facebook/react-native/blob/c5c0563f209ead8f884204763e02115bd66d1960/packages/react-native/template/ios/Podfile#L49-L52
+    react_native_post_install(
+      installer,
+      config[:reactNativePath],
+      :mac_catalyst_enabled => false,
+    )
     # some of libs wouldn't be build for x86_64 otherwise and that is
     # necessary for ios simulators
     installer.pods_project.targets.each do |target|
       target.build_configurations.each do |config|
         config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
-        # fix for no template named 'unary_function' in namespace 'std'; did you mean '__unary_function'?
-        # ref : https://github.com/facebook/react-native/issues/37748
-        # TODO : remove after upgrading to react-native 0.72.x
-        config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']
       end
       # We need to remove the predefinition of IPHONEOS_DEPLOYMENT_TARGET from RNCK lib to use our own.
       case target.name

ios/StatusIm.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
+		231CD38186B86957CFCF645E /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
 		3870E1E692E24133A80B07DE /* Inter-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */; };
 		393D26E3080B443A998F4A2F /* Inter-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */; };
@@ -39,13 +40,13 @@
 		65F6941925780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941A25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
 		65F6941B25780A4F00A45E76 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65F6941825780A4F00A45E76 /* Bridge.swift */; };
+		67A3DF2242D5B6C35A4C6A33 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; };
 		715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */; };
-		9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */; };
+		A1B6E23C86E6A40AFE74E925 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */; };
 		B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; };
 		B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; };
 		B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; };
@@ -60,7 +61,6 @@
 		D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; };
 		D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; };
 		D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; };
-		E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,14 +108,14 @@
 		00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
+		0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = "<group>"; };
-		28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -123,24 +123,22 @@
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
 		4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
-		5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
+		5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
-		668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
 		8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = "<group>"; };
-		9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
-		A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = "<group>"; };
-		ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
+		A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = "<group>"; };
 		B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
@@ -153,7 +151,9 @@
 		C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = "<group>"; };
 		CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
+		D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
+		E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
+		EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				67A3DF2242D5B6C35A4C6A33 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +174,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */,
+				231CD38186B86957CFCF645E /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +188,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */,
+				A1B6E23C86E6A40AFE74E925 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */,
-				9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */,
-				5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */,
+				5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */,
+				A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */,
+				0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */,
-				668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */,
-				59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */,
-				A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */,
+				B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */,
+				5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */,
+				E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */,
+				D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */,
+				9B331412309D5F5632348AEE /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */,
+				7545D1B37CABFA574D6D6C31 /* [CP] Embed Pods Frameworks */,
+				A3AD03105488DA5BC8E8C199 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +362,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */,
+				236F25332B0D1B4DCC0E041E /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				28606042DA81A750949525E4 /* [CP] Copy Pods Resources */,
+				37D91248C8178FEAC1661AE0 /* [CP] Embed Pods Frameworks */,
+				BC5CED24C6D00996607C4942 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +385,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */,
+				D0B7F25508F9BD7C6B30AF36 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */,
+				5C9736BD9798020B8F31802B /* [CP] Embed Pods Frameworks */,
+				B76C3637DC2DDBB6E8472904 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -542,59 +545,9 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env sh";
-			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ../logs/react-native-xcode.log 2>&1";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\n\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n";
 		};
-		28606042DA81A750949525E4 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Bundle React Native code and images";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = "/usr/bin/env sh";
-			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --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;
-			buildActionMask = 8;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Run Script";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
-		};
-		523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */ = {
+		236F25332B0D1B4DCC0E041E /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -616,51 +569,89 @@
 			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;
 		};
-		BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */ = {
+		37D91248C8178FEAC1661AE0 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
-			name = "[CP] Copy Pods Resources";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */ = {
+		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
+			inputPaths = (
+			);
+			name = "Bundle React Native code and images";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = "/usr/bin/env sh";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\n\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n";
+		};
+		3AAD2AD724A3A60E0075D594 /* Run Script */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 8;
+			files = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
 			);
+			name = "Run Script";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+			shellPath = "/usr/bin/env sh";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
+		};
+		5C9736BD9798020B8F31802B /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/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";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */ = {
+		7545D1B37CABFA574D6D6C31 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9B331412309D5F5632348AEE /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -682,7 +673,7 @@
 			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;
 		};
-		D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */ = {
+		A3AD03105488DA5BC8E8C199 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -690,13 +681,15 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh",
 				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -704,6 +697,76 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		B76C3637DC2DDBB6E8472904 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		BC5CED24C6D00996607C4942 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNPermissions/RNPermissionsPrivacyInfo.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNPermissionsPrivacyInfo.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		D0B7F25508F9BD7C6B30AF36 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/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;
+		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 8;
@@ -716,7 +779,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -765,7 +828,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -782,27 +845,27 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusImTests-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm";
 			};
 			name = Debug;
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -816,30 +879,30 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = StatusImTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusImTests-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/StatusIm.app/StatusIm";
 			};
 			name = Release;
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
@@ -879,13 +942,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -894,19 +958,20 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
 					"-ObjC",
+					"-lresolv",
 				);
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.2;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "x86_64 arm64";
 				"VALID_ARCHS[sdk=iphonesimulator*]" = "x86_64 ";
@@ -915,11 +980,11 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -953,13 +1018,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -968,19 +1034,20 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
 					"-ObjC",
+					"-lresolv",
 				);
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
 				PROVISIONING_PROFILE = "e2202b12-7a66-4ff7-af3c-a52e35f32dc1";
 				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.2;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = arm64;
 			};
@@ -988,11 +1055,11 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
@@ -1031,13 +1098,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -1046,18 +1114,20 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
 					"-ObjC",
+					"-lresolv",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
 				PRODUCT_NAME = "Status PR";
 				PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum.pr";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.2;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = arm64;
 			};
@@ -1065,11 +1135,11 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusImPR/StatusImPR.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -1102,13 +1172,14 @@
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusImPR/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
@@ -1117,17 +1188,19 @@
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-lc++",
 					"-ObjC",
+					"-lresolv",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum.pr;
 				PRODUCT_NAME = "Status PR";
 				PROVISIONING_PROFILE_SPECIFIER = "match AdHoc im.status.ethereum.pr";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 5.2;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = arm64;
 			};
@@ -1139,7 +1212,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1166,13 +1239,14 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				EXCLUDED_ARCHS = "";
 				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1203,21 +1277,30 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
+					" ",
 				);
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+				OTHER_LDFLAGS = "$(inherited)";
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = true;
 				VALID_ARCHS = arm64;
 				"VALID_ARCHS[sdk=iphonesimulator*]" = x86_64;
 			};
@@ -1229,7 +1312,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "c++17";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1256,12 +1339,13 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				EXCLUDED_ARCHS = "";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -1284,21 +1368,30 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-lottie-splash-screen/ios/**",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
 					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
 					"\"$(inherited)\"",
 				);
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
 					"-DFOLLY_NO_CONFIG",
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
+					"-DFOLLY_CFG_NO_COROUTINES=1",
+					" ",
 				);
-				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
+				OTHER_LDFLAGS = "$(inherited)";
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
+				USE_HERMES = true;
 				VALIDATE_PRODUCT = YES;
 				VALID_ARCHS = arm64;
 			};

ios/StatusIm/AppDelegate.mm

@@ -104,6 +104,11 @@ extern "C" NSString* StatusgoImageServerTLSCert();
 
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
+{
+  return [self getBundleURL];
+}
+
+- (NSURL *)getBundleURL
 {
 #if DEBUG
   return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];

ios/StatusIm/Info.plist

@@ -2,12 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleBuildUrl</key>
 	<string>????</string>
 	<key>CFBundleCommitHash</key>
 	<string>unknown</string>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Enabling Face ID allows you quick and secure access to your account.</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -59,31 +59,31 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NFCReaderUsageDescription</key>
+	<string>Enable Keycard</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
+		<false/>
+		<key>NSAllowsLocalNetworking</key>
 		<true/>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>Status uses camera to take pictures and scan QR codes.</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Enabling Face ID allows you quick and secure access to your account.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Location access is required for some DApps to function properly.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Location access is required for some DApps to function properly.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Photos access is required to give you the ability to send images.</string>
-	<key>NSPhotoLibraryAddUsageDescription</key>
-	<string>Photos access is required to give you the ability to save images.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Need microphone access for sending audio messages.</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>Photos access is required to give you the ability to save images.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Photos access is required to give you the ability to send images.</string>
+	<key>NSAppleMusicUsageDescription</key>
+	<string>Status uses Media Library to save and send Images. The Media Library module internally requires permissions to Apple Music</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Inter-Bold.otf</string>
@@ -119,8 +119,6 @@
 	<array>
 		<string>armv7</string>
 	</array>
-	<key>UIStatusBarStyle</key>
-	<string>UIStatusBarStyleLightContent</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -133,15 +131,12 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<true/>
 	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
 	<array>
 		<string>A00000080400010101</string>
 		<string>A00000080400010301</string>
 		<string>A000000151000000</string>
 	</array>
-	<key>NFCReaderUsageDescription</key>
-	<string>Enable Keycard</string>
-	<key>CADisableMinimumFrameDurationOnPhone</key><true/>
 </dict>
 </plist>

ios/StatusIm/StatusIm.entitlements

@@ -4,7 +4,6 @@
 <dict>
 	<key>com.apple.developer.nfc.readersession.formats</key>
 	<array>
-		<string>NDEF</string>
 		<string>TAG</string>
 	</array>
 	<key>aps-environment</key>

logs/README.md

@@ -22,6 +22,8 @@ This directory is the destination of logs created during build time of debug bui
 These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`.
 
 * `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`.
+  - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj` for "Bundle React Native code and images" build Phase.
+* `set_xcode_version.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`.
+  - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj` for "Run Script" build Phase.
 * `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`.

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

@@ -1,355 +0,0 @@
-package im.status.ethereum.module;
-
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import statusgo.Statusgo;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.IOException;
-import org.json.JSONObject;
-import org.json.JSONException;
-import android.util.Log;
-import android.content.Context;
-import android.app.Activity;
-
-public class AccountManager extends ReactContextBaseJavaModule {
-    private static final String TAG = "AccountManager";
-    private static final String gethLogFileName = "geth.log";
-    private ReactApplicationContext reactContext;
-
-    private Utils utils;
-    private LogManager logManager;
-
-    public AccountManager(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-        this.utils = new Utils(reactContext);
-        this.logManager = new LogManager(reactContext);
-    }
-
-    @Override
-    public String getName() {
-        return "AccountManager";
-    }
-
-    private String getTestnetDataDir(final String absRootDirPath) {
-        return this.utils.pathCombine(absRootDirPath, "ethereum/testnet");
-    }
-
-    @ReactMethod
-    public void createAccountAndLogin(final String createAccountRequest) {
-        Log.d(TAG, "createAccountAndLogin");
-        String result = Statusgo.createAccountAndLogin(createAccountRequest);
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "createAccountAndLogin success: " + result);
-            Log.d(TAG, "Geth node started");
-        } else {
-            Log.e(TAG, "createAccountAndLogin failed: " + result);
-        }
-    }
-
-    @ReactMethod
-    public void restoreAccountAndLogin(final String restoreAccountRequest) {
-        Log.d(TAG, "restoreAccountAndLogin");
-        String result = Statusgo.restoreAccountAndLogin(restoreAccountRequest);
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "restoreAccountAndLogin success: " + result);
-            Log.d(TAG, "Geth node started");
-        } else {
-            Log.e(TAG, "restoreAccountAndLogin failed: " + result);
-        }
-    }
-
-    private String updateConfig(final String jsonConfigString, final String absRootDirPath, final String keystoreDirPath) throws JSONException {
-        final JSONObject jsonConfig = new JSONObject(jsonConfigString);
-        // retrieve parameters from app config, that will be applied onto the Go-side config later on
-        final String dataDirPath = jsonConfig.getString("DataDir");
-        final Boolean logEnabled = jsonConfig.getBoolean("LogEnabled");
-        final Context context = this.getReactApplicationContext();
-        final File gethLogFile = logEnabled ? this.logManager.prepareLogsFile(context) : null;
-        String gethLogDirPath = null;
-        if (gethLogFile != null) {
-            gethLogDirPath = gethLogFile.getParent();
-        }
-
-        Log.d(TAG, "log dir: " + gethLogDirPath + " log name: " + gethLogFileName);
-
-        jsonConfig.put("DataDir", dataDirPath);
-        jsonConfig.put("KeyStoreDir", keystoreDirPath);
-        jsonConfig.put("LogDir", gethLogDirPath);
-        jsonConfig.put("LogFile", gethLogFileName);
-
-        return jsonConfig.toString();
-    }
-
-    private static void prettyPrintConfig(final String config) {
-        Log.d(TAG, "startNode() with config (see below)");
-        String configOutput = config;
-        final int maxOutputLen = 4000;
-        Log.d(TAG, "********************** NODE CONFIG ****************************");
-        while (!configOutput.isEmpty()) {
-            Log.d(TAG, "Node config:" + configOutput.substring(0, Math.min(maxOutputLen, configOutput.length())));
-            if (configOutput.length() > maxOutputLen) {
-                configOutput = configOutput.substring(maxOutputLen);
-            } else {
-                break;
-            }
-        }
-        Log.d(TAG, "******************* ENDOF NODE CONFIG *************************");
-    }
-
-    private void copyDirectory(File sourceLocation, File targetLocation) throws IOException {
-        if (sourceLocation.isDirectory()) {
-            if (!targetLocation.exists() && !targetLocation.mkdirs()) {
-                throw new IOException("Cannot create dir " + targetLocation.getAbsolutePath());
-            }
-
-            String[] children = sourceLocation.list();
-            for (int i = 0; i < children.length; i++) {
-                copyDirectory(new File(sourceLocation, children[i]), new File(targetLocation, children[i]));
-            }
-        } else {
-            File directory = targetLocation.getParentFile();
-            if (directory != null && !directory.exists() && !directory.mkdirs()) {
-                throw new IOException("Cannot create dir " + directory.getAbsolutePath());
-            }
-
-            InputStream in = new FileInputStream(sourceLocation);
-            OutputStream out = new FileOutputStream(targetLocation);
-
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-            in.close();
-            out.close();
-        }
-    }
-
-    private String prepareDirAndUpdateConfig(final String jsonConfigString, final String keyUID) {
-
-        final String absRootDirPath = this.utils.getNoBackupDirectory();
-        final String dataFolder = this.getTestnetDataDir(absRootDirPath);
-        Log.d(TAG, "Starting Geth node in folder: " + dataFolder);
-
-        try {
-            final File newFile = new File(dataFolder);
-            // todo handle error?
-            newFile.mkdir();
-        } catch (Exception e) {
-            Log.e(TAG, "error making folder: " + dataFolder, e);
-        }
-
-        final String ropstenFlagPath = this.utils.pathCombine(absRootDirPath, "ropsten_flag");
-        final File ropstenFlag = new File(ropstenFlagPath);
-        if (!ropstenFlag.exists()) {
-            try {
-                final String chaindDataFolderPath = this.utils.pathCombine(dataFolder, "StatusIM/lightchaindata");
-                final File lightChainFolder = new File(chaindDataFolderPath);
-                if (lightChainFolder.isDirectory()) {
-                    String[] children = lightChainFolder.list();
-                    for (int i = 0; i < children.length; i++) {
-                        new File(lightChainFolder, children[i]).delete();
-                    }
-                }
-                lightChainFolder.delete();
-                ropstenFlag.createNewFile();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        String testnetDataDir = dataFolder;
-        String oldKeystoreDir = this.utils.pathCombine(testnetDataDir, "keystore");
-        String newKeystoreDir = this.utils.pathCombine(absRootDirPath, "keystore");
-        final File oldKeystore = new File(oldKeystoreDir);
-        if (oldKeystore.exists()) {
-            try {
-                final File newKeystore = new File(newKeystoreDir);
-                copyDirectory(oldKeystore, newKeystore);
-
-                if (oldKeystore.isDirectory()) {
-                    String[] children = oldKeystore.list();
-                    for (int i = 0; i < children.length; i++) {
-                        new File(oldKeystoreDir, children[i]).delete();
-                    }
-                }
-                oldKeystore.delete();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            final String multiaccountKeystoreDir = this.utils.pathCombine("/keystore", keyUID);
-            final String updatedJsonConfigString = this.updateConfig(jsonConfigString, absRootDirPath, multiaccountKeystoreDir);
-
-            prettyPrintConfig(updatedJsonConfigString);
-
-            return updatedJsonConfigString;
-        } catch (JSONException e) {
-            Log.e(TAG, "updateConfig failed: " + e.getMessage());
-            System.exit(1);
-
-            return "";
-        }
-    }
-
-    @ReactMethod
-    public void prepareDirAndUpdateConfig(final String keyUID, final String config, final Callback callback) {
-        Log.d(TAG, "prepareDirAndUpdateConfig");
-        String finalConfig = prepareDirAndUpdateConfig(config, keyUID);
-        callback.invoke(finalConfig);
-    }
-
-    @ReactMethod
-    public void saveAccountAndLoginWithKeycard(final String multiaccountData, final String password, final String settings, final String config, final String accountsData, final String chatKey) {
-        try {
-            Log.d(TAG, "saveAccountAndLoginWithKeycard");
-            String finalConfig = prepareDirAndUpdateConfig(config, this.utils.getKeyUID(multiaccountData));
-            String result = Statusgo.saveAccountAndLoginWithKeycard(multiaccountData, password, settings, finalConfig, accountsData, chatKey);
-            if (result.startsWith("{\"error\":\"\"")) {
-                Log.d(TAG, "saveAccountAndLoginWithKeycard result: " + result);
-                Log.d(TAG, "Geth node started");
-            } else {
-                Log.e(TAG, "saveAccountAndLoginWithKeycard failed: " + result);
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, "JSON conversion failed: " + e.getMessage());
-        }
-    }
-
-    @ReactMethod
-    public void loginWithKeycard(final String accountData, final String password, final String chatKey, final String nodeConfigJSON) {
-        Log.d(TAG, "loginWithKeycard");
-        this.utils.migrateKeyStoreDir(accountData, password);
-        String result = Statusgo.loginWithKeycard(accountData, password, chatKey, nodeConfigJSON);
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "LoginWithKeycard result: " + result);
-        } else {
-            Log.e(TAG, "LoginWithKeycard failed: " + result);
-        }
-    }
-
-    @ReactMethod
-    public void loginWithConfig(final String accountData, final String password, final String configJSON) {
-        Log.d(TAG, "loginWithConfig");
-        this.utils.migrateKeyStoreDir(accountData, password);
-        String result = Statusgo.loginWithConfig(accountData, password, configJSON);
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "LoginWithConfig result: " + result);
-        } else {
-            Log.e(TAG, "LoginWithConfig failed: " + result);
-        }
-    }
-
-    @ReactMethod
-    public void loginAccount(final String request) {
-        Log.d(TAG, "loginAccount");
-        String result = Statusgo.loginAccount(request);
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "loginAccount result: " + result);
-        } else {
-            Log.e(TAG, "loginAccount failed: " + result);
-        }
-    }
-
-    @ReactMethod
-    public void verify(final String address, final String password, final Callback callback) throws JSONException {
-        Activity currentActivity = getCurrentActivity();
-
-        final String absRootDirPath = this.utils.getNoBackupDirectory();
-        final String newKeystoreDir = this.utils.pathCombine(absRootDirPath, "keystore");
-
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.verifyAccountPassword(newKeystoreDir, address, password), callback);
-    }
-
-    @ReactMethod
-    public void verifyDatabasePassword(final String keyUID, final String password, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.verifyDatabasePassword(keyUID, password), callback);
-    }
-
-    @ReactMethod
-    private void openAccounts(final Callback callback) throws JSONException {
-        Log.d(TAG, "openAccounts");
-        final String rootDir = this.utils.getNoBackupDirectory();
-        Log.d(TAG, "[Opening accounts" + rootDir);
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.openAccounts(rootDir), callback);
-    }
-
-    //TODO : refactor logout usage to accept callback so that we can do this.utils.executeRunnableStatusGoMethod
-    @ReactMethod
-    public void logout() {
-        Log.d(TAG, "logout");
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String result = Statusgo.logout();
-                if (result.startsWith("{\"error\":\"\"")) {
-                    Log.d(TAG, "Logout result: " + result);
-                } else {
-                    Log.e(TAG, "Logout failed: " + result);
-                }
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
-    }
-
-    @ReactMethod
-    public void multiAccountStoreAccount(final String json, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountStoreAccount(json), callback);
-    }
-
-    @ReactMethod
-    public void multiAccountLoadAccount(final String json, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountLoadAccount(json), callback);
-    }
-
-    @ReactMethod
-    public void multiAccountDeriveAddresses(final String json, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountDeriveAddresses(json), callback);
-    }
-
-    @ReactMethod
-    public void multiAccountGenerateAndDeriveAddresses(final String json, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountGenerateAndDeriveAddresses(json), callback);
-    }
-
-    @ReactMethod
-    public void multiAccountStoreDerived(final String json, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountStoreDerivedAccounts(json), callback);
-    }
-
-    @ReactMethod
-    public void multiAccountImportMnemonic(final String json, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountImportMnemonic(json), callback);
-    }
-
-    @ReactMethod
-    public void multiAccountImportPrivateKey(final String json, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.multiAccountImportPrivateKey(json), callback);
-    }
-
-    @ReactMethod
-    public void deleteMultiaccount(final String keyUID, final Callback callback) throws JSONException {
-        final String keyStoreDir = this.utils.getKeyStorePath(keyUID);
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deleteMultiaccount(keyUID, keyStoreDir), callback);
-    }
-
-    @ReactMethod
-    public void getRandomMnemonic(final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.getRandomMnemonic(), callback);
-    }
-
-    @ReactMethod
-    public void createAccountFromMnemonicAndDeriveAccountsForPaths(final String mnemonic, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.createAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic), callback);
-    }
-}

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

@@ -0,0 +1,346 @@
+package im.status.ethereum.module
+
+import android.app.Activity
+import android.content.Context
+import android.util.Log
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import org.json.JSONException
+import org.json.JSONObject
+import statusgo.Statusgo
+import java.io.*
+
+class AccountManager(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    private val utils = Utils(reactContext)
+    private val logManager = LogManager(reactContext)
+
+    override fun getName() = "AccountManager"
+
+    private fun getTestnetDataDir(absRootDirPath: String) = utils.pathCombine(absRootDirPath, "ethereum/testnet")
+
+    @ReactMethod
+    fun createAccountAndLogin(createAccountRequest: String) {
+        Log.d(TAG, "createAccountAndLogin")
+        val result = Statusgo.createAccountAndLogin(createAccountRequest)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "createAccountAndLogin success: $result")
+            Log.d(TAG, "Geth node started")
+        } else {
+            Log.e(TAG, "createAccountAndLogin failed: $result")
+        }
+    }
+
+    @ReactMethod
+    fun restoreAccountAndLogin(restoreAccountRequest: String) {
+        Log.d(TAG, "restoreAccountAndLogin")
+        val result = Statusgo.restoreAccountAndLogin(restoreAccountRequest)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "restoreAccountAndLogin success: $result")
+            Log.d(TAG, "Geth node started")
+        } else {
+            Log.e(TAG, "restoreAccountAndLogin failed: $result")
+        }
+    }
+
+    private fun updateConfig(jsonConfigString: String, absRootDirPath: String, keystoreDirPath: String): String {
+        val jsonConfig = JSONObject(jsonConfigString)
+        // when doing local pair syncing, backend will provide default data dir
+        val dataDirPath = jsonConfig.optString("DataDir","")
+        val logEnabled = jsonConfig.getBoolean("LogEnabled")
+        val gethLogFile = if (logEnabled) logManager.prepareLogsFile(reactContext) else null
+        val gethLogDirPath = gethLogFile?.parent
+
+        Log.d(TAG, "log dir: $gethLogDirPath log name: $gethLogFileName")
+
+        jsonConfig.put("DataDir", dataDirPath)
+        jsonConfig.put("KeyStoreDir", keystoreDirPath)
+        jsonConfig.put("LogDir", gethLogDirPath)
+        jsonConfig.put("LogFile", gethLogFileName)
+
+        return jsonConfig.toString()
+    }
+
+    private fun copyDirectory(sourceLocation: File, targetLocation: File) {
+        if (sourceLocation.isDirectory) {
+            if (!targetLocation.exists() && !targetLocation.mkdirs()) {
+                throw IOException("Cannot create dir ${targetLocation.absolutePath}")
+            }
+
+            val children = sourceLocation.list()
+            children?.forEach { child ->
+                copyDirectory(File(sourceLocation, child), File(targetLocation, child))
+            }
+        } else {
+            val directory = targetLocation.parentFile
+            if (directory != null && !directory.exists() && !directory.mkdirs()) {
+                throw IOException("Cannot create dir ${directory.absolutePath}")
+            }
+
+            sourceLocation.inputStream().use { input ->
+                targetLocation.outputStream().use { output ->
+                    input.copyTo(output)
+                }
+            }
+        }
+    }
+
+    private fun prepareDirAndUpdateConfig(jsonConfigString: String, keyUID: String): String {
+        val absRootDirPath = utils.getNoBackupDirectory()
+        val dataFolder = getTestnetDataDir(absRootDirPath)
+        Log.d(TAG, "Starting Geth node in folder: $dataFolder")
+
+        try {
+            File(dataFolder).mkdir()
+        } catch (e: Exception) {
+            Log.e(TAG, "error making folder: $dataFolder", e)
+        }
+
+        val ropstenFlagPath = utils.pathCombine(absRootDirPath, "ropsten_flag")
+        val ropstenFlag = File(ropstenFlagPath)
+        if (!ropstenFlag.exists()) {
+            try {
+                val chaindDataFolderPath = utils.pathCombine(dataFolder, "StatusIM/lightchaindata")
+                val lightChainFolder = File(chaindDataFolderPath)
+                if (lightChainFolder.isDirectory) {
+                    lightChainFolder.listFiles()?.forEach { it.delete() }
+                }
+                lightChainFolder.delete()
+                ropstenFlag.createNewFile()
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+
+        val testnetDataDir = dataFolder
+        val oldKeystoreDir = utils.pathCombine(testnetDataDir, "keystore")
+        val newKeystoreDir = utils.pathCombine(absRootDirPath, "keystore")
+        val oldKeystore = File(oldKeystoreDir)
+        if (oldKeystore.exists()) {
+            try {
+                val newKeystore = File(newKeystoreDir)
+                copyDirectory(oldKeystore, newKeystore)
+
+                if (oldKeystore.isDirectory) {
+                    oldKeystore.listFiles()?.forEach { it.delete() }
+                }
+                oldKeystore.delete()
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+
+        return try {
+            val multiaccountKeystoreDir = utils.pathCombine("/keystore", keyUID)
+            val updatedJsonConfigString = updateConfig(jsonConfigString, absRootDirPath, multiaccountKeystoreDir)
+
+            prettyPrintConfig(updatedJsonConfigString)
+
+            updatedJsonConfigString
+        } catch (e: JSONException) {
+            Log.e(TAG, "updateConfig failed: ${e.message}")
+            ""
+        }
+    }
+
+    @ReactMethod
+    fun prepareDirAndUpdateConfig(keyUID: String, config: String, callback: Callback) {
+        Log.d(TAG, "prepareDirAndUpdateConfig")
+        val finalConfig = prepareDirAndUpdateConfig(config, keyUID)
+        callback.invoke(finalConfig)
+    }
+
+    @ReactMethod
+    fun saveAccountAndLoginWithKeycard(
+        multiaccountData: String,
+        password: String,
+        settings: String,
+        config: String,
+        accountsData: String,
+        chatKey: String
+    ) {
+        try {
+            Log.d(TAG, "saveAccountAndLoginWithKeycard")
+            val keyUID = utils.getKeyUID(multiaccountData)
+            val finalConfig = prepareDirAndUpdateConfig(config, keyUID)
+            val result = Statusgo.saveAccountAndLoginWithKeycard(
+                multiaccountData,
+                password,
+                settings,
+                finalConfig,
+                accountsData,
+                chatKey
+            )
+            if (result.startsWith("{\"error\":\"\"")) {
+                Log.d(TAG, "saveAccountAndLoginWithKeycard result: $result")
+                Log.d(TAG, "Geth node started")
+            } else {
+                Log.e(TAG, "saveAccountAndLoginWithKeycard failed: $result")
+            }
+        } catch (e: JSONException) {
+            Log.e(TAG, "JSON conversion failed: ${e.message}")
+        }
+    }
+
+    @ReactMethod
+    fun loginWithKeycard(accountData: String, password: String, chatKey: String, nodeConfigJSON: String) {
+        Log.d(TAG, "loginWithKeycard")
+        utils.migrateKeyStoreDir(accountData, password)
+        val result = Statusgo.loginWithKeycard(accountData, password, chatKey, nodeConfigJSON)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "LoginWithKeycard result: $result")
+        } else {
+            Log.e(TAG, "LoginWithKeycard failed: $result")
+        }
+    }
+
+    @ReactMethod
+    fun loginWithConfig(accountData: String, password: String, configJSON: String) {
+        Log.d(TAG, "loginWithConfig")
+        utils.migrateKeyStoreDir(accountData, password)
+        val result = Statusgo.loginWithConfig(accountData, password, configJSON)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "LoginWithConfig result: $result")
+        } else {
+            Log.e(TAG, "LoginWithConfig failed: $result")
+        }
+    }
+
+    @ReactMethod
+    fun loginAccount(request: String) {
+        Log.d(TAG, "loginAccount")
+        val result = Statusgo.loginAccount(request)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "loginAccount result: $result")
+        } else {
+            Log.e(TAG, "loginAccount failed: $result")
+        }
+    }
+
+    @ReactMethod
+    fun verify(address: String, password: String, callback: Callback) {
+        val absRootDirPath = utils.getNoBackupDirectory()
+        val newKeystoreDir = utils.pathCombine(absRootDirPath, "keystore")
+
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.verifyAccountPassword(newKeystoreDir, address, password) },
+            callback
+        )
+    }
+
+    @ReactMethod
+    fun verifyDatabasePassword(keyUID: String, password: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.verifyDatabasePassword(keyUID, password) },
+            callback
+        )
+    }
+
+    @ReactMethod
+    private fun openAccounts(callback: Callback) {
+        Log.d(TAG, "openAccounts")
+        val rootDir = utils.getNoBackupDirectory()
+        Log.d(TAG, "[Opening accounts $rootDir")
+        utils.executeRunnableStatusGoMethod({ Statusgo.openAccounts(rootDir) }, callback)
+    }
+
+    @ReactMethod
+    private fun initializeApplication(request: String, callback: Callback) {
+        Log.d(TAG, "initializeApplication")
+        Log.d(TAG, "[Initializing application $request")
+        utils.executeRunnableStatusGoMethod({ Statusgo.initializeApplication(request) }, callback)
+    }
+
+
+    @ReactMethod
+    fun logout() {
+        Log.d(TAG, "logout")
+        val runnable = Runnable {
+            val result = Statusgo.logout()
+            if (result.startsWith("{\"error\":\"\"")) {
+                Log.d(TAG, "Logout result: $result")
+            } else {
+                Log.e(TAG, "Logout failed: $result")
+            }
+        }
+        StatusThreadPoolExecutor.getInstance().execute(runnable)
+    }
+
+    @ReactMethod
+    fun multiAccountStoreAccount(json: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountStoreAccount(json) }, callback)
+    }
+
+    @ReactMethod
+    fun multiAccountLoadAccount(json: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountLoadAccount(json) }, callback)
+    }
+
+    @ReactMethod
+    fun multiAccountDeriveAddresses(json: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountDeriveAddresses(json) }, callback)
+    }
+
+    @ReactMethod
+    fun multiAccountGenerateAndDeriveAddresses(json: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountGenerateAndDeriveAddresses(json) }, callback)
+    }
+
+    @ReactMethod
+    fun multiAccountStoreDerived(json: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountStoreDerivedAccounts(json) }, callback)
+    }
+
+    @ReactMethod
+    fun multiAccountImportMnemonic(json: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountImportMnemonic(json) }, callback)
+    }
+
+    @ReactMethod
+    fun multiAccountImportPrivateKey(json: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.multiAccountImportPrivateKey(json) }, callback)
+    }
+
+    @ReactMethod
+    fun deleteMultiaccount(keyUID: String, callback: Callback) {
+        val keyStoreDir = utils.getKeyStorePath(keyUID)
+        utils.executeRunnableStatusGoMethod({ Statusgo.deleteMultiaccount(keyUID, keyStoreDir) }, callback)
+    }
+
+    @ReactMethod
+    fun getRandomMnemonic(callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.getRandomMnemonic() }, callback)
+    }
+
+    @ReactMethod
+    fun createAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.createAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic) },
+            callback
+        )
+    }
+
+    @ReactMethod
+    fun createAccountFromPrivateKey(json: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.createAccountFromPrivateKey(json) }, callback)
+    }
+
+    companion object {
+        private const val TAG = "AccountManager"
+        private const val gethLogFileName = "geth.log"
+
+        private fun prettyPrintConfig(config: String) {
+            Log.d(TAG, "startNode() with config (see below)")
+            var configOutput = config
+            val maxOutputLen = 4000
+            Log.d(TAG, "********************** NODE CONFIG ****************************")
+            while (configOutput.isNotEmpty()) {
+                Log.d(TAG, "Node config:${configOutput.take(maxOutputLen)}")
+                configOutput = configOutput.drop(maxOutputLen)
+            }
+            Log.d(TAG, "******************* ENDOF NODE CONFIG *************************")
+        }
+    }
+}

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

@@ -1,66 +0,0 @@
-package im.status.ethereum.module;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Callback;
-import statusgo.Statusgo;
-import android.util.Log;
-import java.io.File;
-import android.os.Environment;
-import android.content.Context;
-public class DatabaseManager extends ReactContextBaseJavaModule {
-    private static final String TAG = "DatabaseManager";
-    private ReactApplicationContext reactContext;
-    private static final String exportDBFileName = "export.db";
-    private Utils utils;
-    public DatabaseManager(ReactApplicationContext reactContext) {
-        this.reactContext = reactContext;
-        this.utils = new Utils(reactContext);
-    }
-    @Override
-    public String getName() {
-        return "DatabaseManager";
-    }
-
-    private File getExportDBFile() {
-        final Context context = this.getReactApplicationContext();
-        // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
-        // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
-        final File pubDirectory = context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-        final File filename = new File(pubDirectory, exportDBFileName);
-
-        return filename;
-    }
-
-    @ReactMethod
-    public void exportUnencryptedDatabase(final String accountData, final String password, final Callback callback) {
-        Log.d(TAG, "login");
-
-        final File newFile = getExportDBFile();
-
-        this.utils.migrateKeyStoreDir(accountData, password);
-        String result = Statusgo.exportUnencryptedDatabase(accountData, password, newFile.getAbsolutePath());
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "Login result: " + result);
-        } else {
-            Log.e(TAG, "Login failed: " + result);
-        }
-    }
-
-    @ReactMethod
-    public void importUnencryptedDatabase(final String accountData, final String password) {
-        Log.d(TAG, "importUnencryptedDatabase");
-
-        final File newFile = getExportDBFile();
-
-        this.utils.migrateKeyStoreDir(accountData, password);
-        String result = Statusgo.importUnencryptedDatabase(accountData, password, newFile.getAbsolutePath());
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "import result: " + result);
-        } else {
-            Log.e(TAG, "import failed: " + result);
-        }
-    }
-
-}

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

@@ -0,0 +1,58 @@
+package im.status.ethereum.module
+
+import android.content.Context
+import android.os.Environment
+import android.util.Log
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import statusgo.Statusgo
+import java.io.File
+
+class DatabaseManager(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    private val utils = Utils(reactContext)
+
+    override fun getName() = "DatabaseManager"
+
+    private fun getExportDBFile(): File {
+        val pubDirectory = reactContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+        return File(pubDirectory, exportDBFileName)
+    }
+
+    @ReactMethod
+    fun exportUnencryptedDatabase(accountData: String, password: String, callback: Callback) {
+        Log.d(TAG, "login")
+
+        val newFile = getExportDBFile()
+
+        utils.migrateKeyStoreDir(accountData, password)
+        val result = Statusgo.exportUnencryptedDatabase(accountData, password, newFile.absolutePath)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "Login result: $result")
+        } else {
+            Log.e(TAG, "Login failed: $result")
+        }
+    }
+
+    @ReactMethod
+    fun importUnencryptedDatabase(accountData: String, password: String) {
+        Log.d(TAG, "importUnencryptedDatabase")
+
+        val newFile = getExportDBFile()
+
+        utils.migrateKeyStoreDir(accountData, password)
+        val result = Statusgo.importUnencryptedDatabase(accountData, password, newFile.absolutePath)
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "import result: $result")
+        } else {
+            Log.e(TAG, "import failed: $result")
+        }
+    }
+
+    companion object {
+        private const val TAG = "DatabaseManager"
+        private const val exportDBFileName = "export.db"
+    }
+}

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

@@ -92,6 +92,11 @@ public class EncryptionUtils extends ReactContextBaseJavaModule {
         return Statusgo.hexToUtf8(str);
     }
 
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String serializeLegacyKey(final String publicKey) {
+	return Statusgo.serializeLegacyKey(publicKey);
+    }
+
     @ReactMethod
     public void setBlankPreviewFlag(final Boolean blankPreview) {
         final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this.reactContext);

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

@@ -1,227 +0,0 @@
-package im.status.ethereum.module;
-
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.Callback;
-import java.io.File;
-import java.util.Stack;
-import android.util.Log;
-import android.net.Uri;
-import java.io.OutputStreamWriter;
-import java.io.IOException;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import androidx.core.content.FileProvider;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-import java.util.zip.ZipOutputStream;
-import java.io.FileInputStream;
-import java.util.zip.ZipEntry;
-import org.json.JSONObject;
-import statusgo.Statusgo;
-import android.content.Context;
-import org.json.JSONException;
-public class LogManager extends ReactContextBaseJavaModule {
-    private static final String TAG = "LogManager";
-    private static final String gethLogFileName = "geth.log";
-    private static final String statusLogFileName = "Status.log";
-    private static final String logsZipFileName = "Status-debug-logs.zip";
-    private ReactApplicationContext reactContext;
-    private Utils utils;
-
-    public LogManager(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-        this.utils = new Utils(reactContext);
-    }
-
-    @Override
-    public String getName() {
-        return "LogManager";
-    }
-
-    private File getLogsFile() {
-        final File pubDirectory = this.utils.getPublicStorageDirectory();
-        final File logFile = new File(pubDirectory, gethLogFileName);
-
-        return logFile;
-    }
-
-    public File prepareLogsFile(final Context context) {
-        final File logFile = this.utils.getLogsFile();
-
-        try {
-            logFile.setReadable(true);
-            File parent = logFile.getParentFile();
-            if (!parent.canWrite()) {
-                return null;
-            }
-            if (!parent.exists()) {
-                parent.mkdirs();
-            }
-            logFile.createNewFile();
-            logFile.setWritable(true);
-            Log.d(TAG, "Can write " + logFile.canWrite());
-            Uri gethLogUri = Uri.fromFile(logFile);
-
-            String gethLogFilePath = logFile.getAbsolutePath();
-            Log.d(TAG, gethLogFilePath);
-
-            return logFile;
-        } catch (Exception e) {
-            Log.d(TAG, "Can't create geth.log file! " + e.getMessage());
-        }
-
-        return null;
-    }
-
-    private void showErrorMessage(final String message) {
-        final Activity activity = getCurrentActivity();
-
-        new AlertDialog.Builder(activity)
-                .setTitle("Error")
-                .setMessage(message)
-                .setNegativeButton("Exit", new DialogInterface.OnClickListener() {
-                    public void onClick(final DialogInterface dialog, final int id) {
-                        dialog.dismiss();
-                    }
-                }).show();
-    }
-
-    private void dumpAdbLogsTo(final FileOutputStream statusLogStream) throws IOException {
-        final String filter = "logcat -d -b main ReactNativeJS:D StatusModule:D StatusService:D StatusNativeLogs:D *:S";
-        final java.lang.Process p = Runtime.getRuntime().exec(filter);
-        final java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(p.getInputStream()));
-        final java.io.BufferedWriter out = new java.io.BufferedWriter(new java.io.OutputStreamWriter(statusLogStream));
-        String line;
-        while ((line = in.readLine()) != null) {
-            out.write(line);
-            out.newLine();
-        }
-        out.close();
-        in.close();
-    }
-
-    private Boolean zip(File[] _files, File zipFile, Stack<String> errorList) {
-        final int BUFFER = 0x8000;
-
-        try {
-            BufferedInputStream origin = null;
-            FileOutputStream dest = new FileOutputStream(zipFile);
-            ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(dest));
-            byte data[] = new byte[BUFFER];
-
-            for (int i = 0; i < _files.length; i++) {
-                final File file = _files[i];
-                if (file == null || !file.exists()) {
-                    continue;
-                }
-
-                Log.v("Compress", "Adding: " + file.getAbsolutePath());
-                try {
-                    FileInputStream fi = new FileInputStream(file);
-                    origin = new BufferedInputStream(fi, BUFFER);
-
-                    ZipEntry entry = new ZipEntry(file.getName());
-                    out.putNextEntry(entry);
-                    int count;
-
-                    while ((count = origin.read(data, 0, BUFFER)) != -1) {
-                        out.write(data, 0, count);
-                    }
-                    origin.close();
-                } catch (IOException e) {
-                    Log.e(TAG, e.getMessage());
-                    errorList.push(e.getMessage());
-                }
-            }
-
-            out.close();
-
-            return true;
-        } catch (Exception e) {
-            Log.e(TAG, e.getMessage());
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    @ReactMethod
-    public void sendLogs(final String dbJson, final String jsLogs, final Callback callback) {
-        Log.d(TAG, "sendLogs");
-        if (!this.utils.checkAvailability()) {
-            return;
-        }
-
-        final Context context = this.getReactApplicationContext();
-        final File logsTempDir = new File(context.getCacheDir(), "logs"); // This path needs to be in sync with android/app/src/main/res/xml/file_provider_paths.xml
-        logsTempDir.mkdir();
-
-        final File dbFile = new File(logsTempDir, "db.json");
-        try {
-            OutputStreamWriter outputStreamWriter = new OutputStreamWriter(new FileOutputStream(dbFile));
-            outputStreamWriter.write(dbJson);
-            outputStreamWriter.close();
-        } catch (IOException e) {
-            Log.e(TAG, "File write failed: " + e.toString());
-            showErrorMessage(e.getLocalizedMessage());
-        }
-
-        final File zipFile = new File(logsTempDir, logsZipFileName);
-        final File statusLogFile = new File(logsTempDir, statusLogFileName);
-        final File gethLogFile = getLogsFile();
-
-        try {
-            if (zipFile.exists() || zipFile.createNewFile()) {
-                final long usableSpace = zipFile.getUsableSpace();
-                if (usableSpace < 20 * 1024 * 1024) {
-                    final String message = String.format("Insufficient space available on device (%s) to write logs.\nPlease free up some space.", android.text.format.Formatter.formatShortFileSize(context, usableSpace));
-                    Log.e(TAG, message);
-                    showErrorMessage(message);
-                    return;
-                }
-            }
-
-            dumpAdbLogsTo(new FileOutputStream(statusLogFile));
-
-            final Stack<String> errorList = new Stack<String>();
-            final Boolean zipped = zip(new File[]{dbFile, gethLogFile, statusLogFile}, zipFile, errorList);
-            if (zipped && zipFile.exists()) {
-                zipFile.setReadable(true, false);
-                Uri extUri = FileProvider.getUriForFile(context, context.getPackageName() + ".provider", zipFile);
-                callback.invoke(extUri.toString());
-            } else {
-                Log.d(TAG, "File " + zipFile.getAbsolutePath() + " does not exist");
-            }
-        } catch (Exception e) {
-            Log.e(TAG, e.getMessage());
-            showErrorMessage(e.getLocalizedMessage());
-            e.printStackTrace();
-            return;
-        } finally {
-            dbFile.delete();
-            statusLogFile.delete();
-            zipFile.deleteOnExit();
-        }
-    }
-
-    @ReactMethod
-    public void initLogging(final boolean enabled, final boolean mobileSystem, final String logLevel, final Callback callback) throws JSONException {
-        final JSONObject jsonConfig = new JSONObject();
-        jsonConfig.put("Enabled", enabled);
-        jsonConfig.put("MobileSystem", mobileSystem);
-        jsonConfig.put("Level", logLevel);
-        jsonConfig.put("File", getLogsFile().getAbsolutePath());
-        final String config = jsonConfig.toString();
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.initLogging(config), callback);
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String logFileDirectory() {
-        return this.utils.getPublicStorageDirectory().getAbsolutePath();
-    }
-
-}

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

@@ -0,0 +1,211 @@
+package im.status.ethereum.module
+
+import android.app.Activity
+import android.app.AlertDialog
+import android.content.Context
+import android.content.DialogInterface
+import android.net.Uri
+import android.util.Log
+import androidx.core.content.FileProvider
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import org.json.JSONException
+import org.json.JSONObject
+import statusgo.Statusgo
+import java.io.*
+import java.util.*
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+
+class LogManager(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    private val utils = Utils(reactContext)
+
+    override fun getName() = "LogManager"
+
+    private fun getLogsFile(): File {
+        val pubDirectory = utils.getPublicStorageDirectory()
+        return File(pubDirectory, gethLogFileName)
+    }
+
+    fun prepareLogsFile(context: Context): File? {
+        val logFile = utils.getLogsFile()
+
+        try {
+            logFile.setReadable(true)
+            val parent = logFile.parentFile
+            if (!parent?.canWrite()!!) {
+                return null
+            }
+            if (!parent.exists()) {
+                parent.mkdirs()
+            }
+            logFile.createNewFile()
+            logFile.setWritable(true)
+            Log.d(TAG, "Can write ${logFile.canWrite()}")
+            val gethLogUri = Uri.fromFile(logFile)
+
+            val gethLogFilePath = logFile.absolutePath
+            Log.d(TAG, gethLogFilePath)
+
+            return logFile
+        } catch (e: Exception) {
+            Log.d(TAG, "Can't create geth.log file! ${e.message}")
+        }
+
+        return null
+    }
+
+    private fun showErrorMessage(message: String) {
+        val activity = currentActivity
+
+        AlertDialog.Builder(activity)
+            .setTitle("Error")
+            .setMessage(message)
+            .setNegativeButton("Exit") { dialog, _ ->
+                dialog.dismiss()
+            }.show()
+    }
+
+    private fun dumpAdbLogsTo(statusLogStream: FileOutputStream) {
+        val filter = "logcat -d -b main ReactNativeJS:D StatusModule:D StatusService:D StatusNativeLogs:D *:S"
+        val p = Runtime.getRuntime().exec(filter)
+        val input = BufferedReader(InputStreamReader(p.inputStream))
+        val output = BufferedWriter(OutputStreamWriter(statusLogStream))
+        var line: String?
+        while (input.readLine().also { line = it } != null) {
+            output.write(line)
+            output.newLine()
+        }
+        output.close()
+        input.close()
+    }
+
+    private fun zip(files: Array<File>, zipFile: File, errorList: Stack<String>): Boolean {
+        val BUFFER = 0x8000
+
+        try {
+            var origin: BufferedInputStream? = null
+            val dest = FileOutputStream(zipFile)
+            val out = ZipOutputStream(BufferedOutputStream(dest))
+            val data = ByteArray(BUFFER)
+
+            for (file in files) {
+                if (file == null || !file.exists()) {
+                    continue
+                }
+
+                Log.v("Compress", "Adding: ${file.absolutePath}")
+                try {
+                    val fi = FileInputStream(file)
+                    origin = BufferedInputStream(fi, BUFFER)
+
+                    val entry = ZipEntry(file.name)
+                    out.putNextEntry(entry)
+                    var count: Int
+
+                    while (origin.read(data, 0, BUFFER).also { count = it } != -1) {
+                        out.write(data, 0, count)
+                    }
+                    origin.close()
+                } catch (e: IOException) {
+                    Log.e(TAG, e.message!!)
+                    errorList.push(e.message!!)
+                }
+            }
+
+            out.close()
+
+            return true
+        } catch (e: Exception) {
+            Log.e(TAG, e.message!!)
+            e.printStackTrace()
+            return false
+        }
+    }
+
+    @ReactMethod
+    fun sendLogs(dbJson: String, jsLogs: String, callback: Callback) {
+        Log.d(TAG, "sendLogs")
+        if (!utils.checkAvailability()) {
+            return
+        }
+
+        val context = reactApplicationContext
+        val logsTempDir = File(context.cacheDir, "logs") // This path needs to be in sync with android/app/src/main/res/xml/file_provider_paths.xml
+        logsTempDir.mkdir()
+
+        val dbFile = File(logsTempDir, "db.json")
+        try {
+            val outputStreamWriter = OutputStreamWriter(FileOutputStream(dbFile))
+            outputStreamWriter.write(dbJson)
+            outputStreamWriter.close()
+        } catch (e: IOException) {
+            Log.e(TAG, "File write failed: ${e}")
+            showErrorMessage(e.localizedMessage!!)
+        }
+
+        val zipFile = File(logsTempDir, logsZipFileName)
+        val statusLogFile = File(logsTempDir, statusLogFileName)
+        val gethLogFile = getLogsFile()
+
+        try {
+            if (zipFile.exists() || zipFile.createNewFile()) {
+                val usableSpace = zipFile.usableSpace
+                if (usableSpace < 20 * 1024 * 1024) {
+                    val message = "Insufficient space available on device (${android.text.format.Formatter.formatShortFileSize(context, usableSpace)}) to write logs.\nPlease free up some space."
+                    Log.e(TAG, message)
+                    showErrorMessage(message)
+                    return
+                }
+            }
+
+            dumpAdbLogsTo(FileOutputStream(statusLogFile))
+
+            val errorList = Stack<String>()
+            val zipped = zip(arrayOf(dbFile, gethLogFile, statusLogFile), zipFile, errorList)
+            if (zipped && zipFile.exists()) {
+                zipFile.setReadable(true, false)
+                val extUri = FileProvider.getUriForFile(context, "${context.packageName}.provider", zipFile)
+                callback.invoke(extUri.toString())
+            } else {
+                Log.d(TAG, "File ${zipFile.absolutePath} does not exist")
+            }
+        } catch (e: Exception) {
+            Log.e(TAG, e.message!!)
+            showErrorMessage(e.localizedMessage!!)
+            e.printStackTrace()
+            return
+        } finally {
+            dbFile.delete()
+            statusLogFile.delete()
+            zipFile.deleteOnExit()
+        }
+    }
+
+    @ReactMethod
+    fun initLogging(enabled: Boolean, mobileSystem: Boolean, logLevel: String, callback: Callback) {
+        val jsonConfig = JSONObject().apply {
+            put("Enabled", enabled)
+            put("MobileSystem", mobileSystem)
+            put("Level", logLevel)
+            put("File", getLogsFile().absolutePath)
+        }
+        val config = jsonConfig.toString()
+        utils.executeRunnableStatusGoMethod({ Statusgo.initLogging(config) }, callback)
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun logFileDirectory(): String? {
+        return utils.getPublicStorageDirectory()?.absolutePath
+    }
+
+    companion object {
+        private const val TAG = "LogManager"
+        private const val gethLogFileName = "geth.log"
+        private const val statusLogFileName = "Status.log"
+        private const val logsZipFileName = "Status-debug-logs.zip"
+    }
+}

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

@@ -0,0 +1,133 @@
+package im.status.ethereum.module
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.Callback
+import android.util.Log
+import android.content.Intent
+import android.net.Uri
+import android.content.pm.PackageManager
+import java.io.File
+import androidx.core.content.FileProvider
+import android.text.Html
+
+class MailManager(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    private val utils = Utils(reactContext)
+
+    override fun getName() = "MailManager"
+
+        @ReactMethod
+        fun mail(options: ReadableMap, callback: Callback) {
+            Log.d(TAG, "attempting to send email")
+            val i = Intent(Intent.ACTION_SEND_MULTIPLE)
+            val selectorIntent = Intent(Intent.ACTION_SENDTO, Uri.parse("mailto:"))
+            i.selector = selectorIntent
+
+            if (options.hasKey("subject") && !options.isNull("subject")) {
+                i.putExtra(Intent.EXTRA_SUBJECT, options.getString("subject"))
+            }
+
+            if (options.hasKey("body") && !options.isNull("body")) {
+                val body = options.getString("body")
+                if (options.hasKey("isHTML") && options.getBoolean("isHTML")) {
+                    i.putExtra(Intent.EXTRA_TEXT, Html.fromHtml(body))
+                } else {
+                    i.putExtra(Intent.EXTRA_TEXT, body)
+                }
+            }
+
+            if (options.hasKey("recipients") && !options.isNull("recipients")) {
+                val recipients = options.getArray("recipients")
+                i.putExtra(Intent.EXTRA_EMAIL, this.utils.readableArrayToStringArray(recipients!!))
+            }
+
+            if (options.hasKey("ccRecipients") && !options.isNull("ccRecipients")) {
+                val ccRecipients = options.getArray("ccRecipients")
+                i.putExtra(Intent.EXTRA_CC, this.utils.readableArrayToStringArray(ccRecipients!!))
+            }
+
+            if (options.hasKey("bccRecipients") && !options.isNull("bccRecipients")) {
+                val bccRecipients = options.getArray("bccRecipients")
+                i.putExtra(Intent.EXTRA_BCC, this.utils.readableArrayToStringArray(bccRecipients!!))
+            }
+
+            if (options.hasKey("attachments") && !options.isNull("attachments")) {
+                val r = options.getArray("attachments")
+                val length = r?.size() ?: 0
+
+                val provider = reactContext.applicationContext.packageName + ".rnmail.provider"
+                val resolvedIntentActivities = reactContext.packageManager.queryIntentActivities(i,
+                        PackageManager.MATCH_DEFAULT_ONLY)
+
+                val uris = ArrayList<Uri>()
+                for (keyIndex in 0 until length) {
+                    val clip = r?.getMap(keyIndex)
+                    val uri: Uri
+                    if (clip?.hasKey("path") == true && !clip.isNull("path")) {
+                        val path = clip.getString("path")
+                        val file = File(path)
+                        uri = FileProvider.getUriForFile(reactContext, provider, file)
+                    } else if (clip?.hasKey("uri") == true && !clip.isNull("uri")) {
+                        val uriPath = clip.getString("uri")
+                        uri = Uri.parse(uriPath)
+                    } else {
+                        callback.invoke("not_found")
+                        return
+                    }
+                    uris.add(uri)
+
+                    for (resolvedIntentInfo in resolvedIntentActivities) {
+                        val packageName = resolvedIntentInfo.activityInfo.packageName
+                        reactContext.grantUriPermission(packageName, uri,
+                                Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    }
+                }
+
+                i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                i.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris)
+            }
+
+            val manager = reactContext.packageManager
+            val list = manager.queryIntentActivities(i, 0)
+
+            if (list == null || list.isEmpty()) {
+                Log.d(TAG, "not_available")
+                callback.invoke("not_available")
+                return
+            }
+
+            if (list.size == 1) {
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                try {
+                    reactContext.startActivity(i)
+                } catch (ex: Exception) {
+                    Log.e(TAG, ex.message!!)
+                    callback.invoke("error")
+                }
+            } else {
+                var chooserTitle = "Send Mail"
+
+                if (options.hasKey("customChooserTitle") && !options.isNull("customChooserTitle")) {
+                    chooserTitle = options.getString("customChooserTitle") ?: ""
+                }
+
+                val chooser = Intent.createChooser(i, chooserTitle)
+                chooser.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+
+                try {
+                    reactContext.startActivity(chooser)
+                } catch (ex: Exception) {
+                    Log.e(TAG, ex.message!!)
+                    callback.invoke("error")
+                }
+            }
+        }
+
+    companion object {
+        private const val TAG = "MailManager"
+    }
+
+}

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

@@ -1,78 +0,0 @@
-package im.status.ethereum.module;
-
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Callback;
-import org.json.JSONException;
-import statusgo.Statusgo;
-import org.json.JSONObject;
-
-public class NetworkManager extends ReactContextBaseJavaModule {
-    private ReactApplicationContext reactContext;
-    private Utils utils;
-
-    public NetworkManager(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-        this.utils = new Utils(reactContext);
-    }
-
-    @Override
-    public String getName() {
-        return "NetworkManager";
-    }
-
-    @ReactMethod
-    public void startSearchForLocalPairingPeers(final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.startSearchForLocalPairingPeers(), callback);
-    }
-
-    @ReactMethod
-    public void getConnectionStringForBootstrappingAnotherDevice(final String configJSON, final Callback callback) throws JSONException {
-        final JSONObject jsonConfig = new JSONObject(configJSON);
-        final JSONObject senderConfig = jsonConfig.getJSONObject("senderConfig");
-        final String keyUID = senderConfig.getString("keyUID");
-        final String keyStorePath = this.utils.getKeyStorePath(keyUID);
-        senderConfig.put("keystorePath", keyStorePath);
-
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.getConnectionStringForBootstrappingAnotherDevice(jsonConfig.toString()), callback);
-    }
-
-    @ReactMethod
-    public void inputConnectionStringForBootstrapping(final String connectionString, final String configJSON, final Callback callback) throws JSONException {
-        final JSONObject jsonConfig = new JSONObject(configJSON);
-        final JSONObject receiverConfig = jsonConfig.getJSONObject("receiverConfig");
-        final String keyStorePath = this.utils.pathCombine(this.utils.getNoBackupDirectory(), "/keystore");
-        receiverConfig.put("keystorePath", keyStorePath);
-        receiverConfig.getJSONObject("nodeConfig").put("rootDataDir", this.utils.getNoBackupDirectory());
-
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.inputConnectionStringForBootstrapping(connectionString, jsonConfig.toString()), callback);
-    }
-
-    @ReactMethod
-    public void sendTransactionWithSignature(final String txArgsJSON, final String signature, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.sendTransactionWithSignature(txArgsJSON, signature), callback);
-    }
-
-    @ReactMethod
-    public void sendTransaction(final String txArgsJSON, final String password, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.sendTransaction(txArgsJSON, password), callback);
-    }
-
-    @ReactMethod
-    public void callRPC(final String payload, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.callRPC(payload), callback);
-    }
-
-    @ReactMethod
-    public void callPrivateRPC(final String payload, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.callPrivateRPC(payload), callback);
-    }
-
-    @ReactMethod
-    public void recover(final String rpcParams, final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.recover(rpcParams), callback);
-    }
-
-}

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

@@ -0,0 +1,103 @@
+package im.status.ethereum.module
+
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import org.json.JSONException
+import org.json.JSONObject
+import statusgo.Statusgo
+
+class NetworkManager(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    private val utils = Utils(reactContext)
+
+    override fun getName() = "NetworkManager"
+
+    @ReactMethod
+    fun startSearchForLocalPairingPeers(callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.startSearchForLocalPairingPeers() }, callback)
+    }
+
+    @ReactMethod
+    fun getConnectionStringForBootstrappingAnotherDevice(configJSON: String, callback: Callback) {
+        val jsonConfig = JSONObject(configJSON)
+        val senderConfig = jsonConfig.getJSONObject("senderConfig")
+        val keyUID = senderConfig.getString("keyUID")
+        val keyStorePath = utils.getKeyStorePath(keyUID)
+        senderConfig.put("keystorePath", keyStorePath)
+
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.getConnectionStringForBootstrappingAnotherDevice(jsonConfig.toString()) },
+            callback
+        )
+    }
+
+    @ReactMethod
+    fun inputConnectionStringForBootstrapping(connectionString: String, configJSON: String, callback: Callback) {
+        val jsonConfig = JSONObject(configJSON)
+        val receiverConfig = jsonConfig.getJSONObject("receiverConfig")
+        val keyStorePath = utils.pathCombine(utils.getNoBackupDirectory(), "/keystore")
+        receiverConfig.put("keystorePath", keyStorePath)
+        receiverConfig.getJSONObject("nodeConfig").put("rootDataDir", utils.getNoBackupDirectory())
+
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.inputConnectionStringForBootstrapping(connectionString, jsonConfig.toString()) },
+            callback
+        )
+    }
+
+    @ReactMethod
+    fun sendTransactionWithSignature(txArgsJSON: String, signature: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod(
+            { Statusgo.sendTransactionWithSignature(txArgsJSON, signature) },
+            callback
+        )
+    }
+
+    @ReactMethod
+    fun sendTransaction(txArgsJSON: String, password: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.sendTransaction(txArgsJSON, password) }, callback)
+    }
+
+    @ReactMethod
+    fun callRPC(payload: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.callRPC(payload) }, callback)
+    }
+
+    @ReactMethod
+    fun callPrivateRPC(payload: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.callPrivateRPC(payload) }, callback)
+    }
+
+    @ReactMethod
+    fun recover(rpcParams: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.recover(rpcParams) }, callback)
+    }
+
+    @ReactMethod
+    fun getConnectionStringForExportingKeypairsKeystores(configJSON: String, callback: Callback) {
+        val jsonConfig = JSONObject(configJSON)
+        val senderConfig = jsonConfig.getJSONObject("senderConfig")
+        val keyUID = senderConfig.getString("loggedInKeyUid")
+        val keyStorePath = utils.getKeyStorePath(keyUID)
+        senderConfig.put("keystorePath", keyStorePath)
+
+        utils.executeRunnableStatusGoMethod(
+                { Statusgo.getConnectionStringForExportingKeypairsKeystores(jsonConfig.toString()) },
+                callback)
+    }
+
+    @ReactMethod
+    fun inputConnectionStringForImportingKeypairsKeystores(connectionString: String, configJSON: String, callback: Callback) {
+        val jsonConfig = JSONObject(configJSON)
+        val receiverConfig = jsonConfig.getJSONObject("receiverConfig")
+        val keyStorePath = utils.pathCombine(utils.getNoBackupDirectory(), "/keystore")
+        receiverConfig.put("keystorePath", keyStorePath)
+
+        utils.executeRunnableStatusGoMethod(
+                { Statusgo.inputConnectionStringForImportingKeypairsKeystores(connectionString, jsonConfig.toString()) },
+                callback
+        )
+    }
+}

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

@@ -1,147 +0,0 @@
-package im.status.ethereum.module;
-
-import android.app.Activity;
-import android.util.Log;
-import android.view.Window;
-import android.view.WindowManager;
-import android.os.Build;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-
-import statusgo.SignalHandler;
-import statusgo.Statusgo;
-
-import org.json.JSONException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Nullable;
-
-class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventListener, SignalHandler {
-
-    private static final String TAG = "StatusModule";
-    private static StatusModule module;
-    private ReactApplicationContext reactContext;
-    private boolean rootedDevice;
-    private boolean background;
-    private Utils utils;
-
-
-    StatusModule(ReactApplicationContext reactContext, boolean rootedDevice) {
-        super(reactContext);
-        this.reactContext = reactContext;
-        this.rootedDevice = rootedDevice;
-        this.utils = new Utils(reactContext);
-
-        reactContext.addLifecycleEventListener(this);
-    }
-
-    @Override
-    public String getName() {
-        return "Status";
-    }
-
-    @Override
-    public void onHostResume() {
-        module = this;
-        this.background = false;
-        Statusgo.setMobileSignalHandler(this);
-    }
-
-    @Override
-    public void onHostPause() {
-        this.background = true;
-    }
-
-    @Override
-    public void onHostDestroy() {
-        Log.d(TAG, "******************* ON HOST DESTROY *************************");
-    }
-
-    public void handleSignal(final String jsonEventString) {
-        Log.d(TAG, "Signal event");
-        WritableMap params = Arguments.createMap();
-        params.putString("jsonEvent", jsonEventString);
-        this.getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class).emit("gethEvent", params);
-    }
-
-    @ReactMethod
-    public void closeApplication() {
-        System.exit(0);
-    }
-
-    @ReactMethod
-    public void connectionChange(final String type, final boolean isExpensive) {
-        Log.d(TAG, "ConnectionChange: " + type + ", is expensive " + isExpensive);
-        Statusgo.connectionChange(type, isExpensive ? 1 : 0);
-    }
-
-    @ReactMethod
-    public void appStateChange(final String type) {
-        Log.d(TAG, "AppStateChange: " + type);
-        Statusgo.appStateChange(type);
-    }
-
-    @ReactMethod
-    public void startLocalNotifications() {
-        Log.d(TAG, "startLocalNotifications");
-        Statusgo.startLocalNotifications();
-    }
-
-    @ReactMethod
-    public void getNodeConfig(final Callback callback) throws JSONException {
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.getNodeConfig(), callback);
-    }
-
-    @ReactMethod
-    public void deleteImportedKey(final String keyUID, final String address, final String password, final Callback callback) throws JSONException {
-        final String keyStoreDir = this.utils.getKeyStorePath(keyUID);
-        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deleteImportedKey(address, password, keyStoreDir), callback);
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String fleets() {
-        return Statusgo.fleets();
-    }
-
-    @Override
-    public @Nullable
-    Map<String, Object> getConstants() {
-        HashMap<String, Object> constants = new HashMap<String, Object>();
-
-        constants.put("is24Hour", this.utils.is24Hour());
-        constants.put("model", Build.MODEL);
-        constants.put("brand", Build.BRAND);
-        constants.put("buildId", Build.ID);
-        constants.put("deviceId", Build.BOARD);
-        return constants;
-    }
-
-    @ReactMethod
-    public void isDeviceRooted(final Callback callback) {
-        callback.invoke(rootedDevice);
-    }
-
-    @ReactMethod
-    public void deactivateKeepAwake() {
-        final Activity activity = getCurrentActivity();
-
-        if (activity != null) {
-            activity.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    activity.getWindow().clearFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-                }
-            });
-        }
-    }
-
-}
-

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

@@ -0,0 +1,123 @@
+package im.status.ethereum.module
+
+import android.app.Activity
+import android.os.Build
+import android.util.Log
+import com.facebook.react.bridge.*
+import com.facebook.react.modules.core.DeviceEventManagerModule
+import statusgo.SignalHandler
+import statusgo.Statusgo
+import org.json.JSONException
+import android.view.WindowManager
+
+class StatusModule(private val reactContext: ReactApplicationContext, private val rootedDevice: Boolean) : ReactContextBaseJavaModule(reactContext), LifecycleEventListener, SignalHandler {
+
+    companion object {
+        private const val TAG = "StatusModule"
+        private var module: StatusModule? = null
+    }
+
+    private val utils: Utils = Utils(reactContext)
+    private var background: Boolean = false
+
+    init {
+        reactContext.addLifecycleEventListener(this)
+    }
+
+    override fun getName(): String {
+        return "Status"
+    }
+
+    override fun onHostResume() {
+        module = this
+        background = false
+        Statusgo.setMobileSignalHandler(this)
+    }
+
+    override fun onHostPause() {
+        background = true
+    }
+
+    override fun onHostDestroy() {
+        Log.d(TAG, "******************* ON HOST DESTROY *************************")
+    }
+
+    override fun handleSignal(jsonEventString: String) {
+        val params = Arguments.createMap()
+        params.putString("jsonEvent", jsonEventString)
+        reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("gethEvent", params)
+    }
+
+    @ReactMethod
+    fun closeApplication() {
+        System.exit(0)
+    }
+
+    @ReactMethod
+    fun connectionChange(type: String, isExpensive: Boolean) {
+        Log.d(TAG, "ConnectionChange: $type, is expensive $isExpensive")
+        Statusgo.connectionChange(type, if (isExpensive) 1 else 0)
+    }
+
+    @ReactMethod
+    fun appStateChange(type: String) {
+        Log.d(TAG, "AppStateChange: $type")
+        Statusgo.appStateChange(type)
+    }
+
+    @ReactMethod
+    fun startLocalNotifications() {
+        Log.d(TAG, "startLocalNotifications")
+        Statusgo.startLocalNotifications()
+    }
+
+    @ReactMethod
+    fun getNodeConfig(callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.getNodeConfig() }, callback)
+    }
+
+    @ReactMethod
+    fun addCentralizedMetric(request: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.addCentralizedMetric(request) }, callback)
+    }
+
+    @ReactMethod
+    fun toggleCentralizedMetrics(request: String, callback: Callback) {
+        utils.executeRunnableStatusGoMethod({ Statusgo.toggleCentralizedMetrics(request) }, callback)
+    }
+
+    @ReactMethod
+    fun deleteImportedKey(keyUID: String, address: String, password: String, callback: Callback) {
+        val keyStoreDir = utils.getKeyStorePath(keyUID)
+        utils.executeRunnableStatusGoMethod({ Statusgo.deleteImportedKey(address, password, keyStoreDir) }, callback)
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun fleets(): String {
+        return Statusgo.fleets()
+    }
+
+    override fun getConstants(): Map<String, Any>? {
+        return hashMapOf(
+            "is24Hour" to utils.is24Hour(),
+            "model" to Build.MODEL,
+            "brand" to Build.BRAND,
+            "buildId" to Build.ID,
+            "deviceId" to Build.BOARD
+        )
+    }
+
+    @ReactMethod
+    fun isDeviceRooted(callback: Callback) {
+        callback.invoke(rootedDevice)
+    }
+
+    @ReactMethod
+    fun deactivateKeepAwake() {
+        val activity = currentActivity
+
+        activity?.runOnUiThread {
+            activity.window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        }
+    }
+}

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

@@ -1,51 +0,0 @@
-package im.status.ethereum.module;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.JavaScriptModule;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import statusgo.Statusgo;
-
-public class StatusPackage implements ReactPackage {
-
-    private boolean rootedDevice;
-
-    public static String getImageTLSCert() {
-        return Statusgo.imageServerTLSCert();
-    }
-
-    public StatusPackage(boolean rootedDevice) {
-        this.rootedDevice = rootedDevice;
-    }
-
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-
-        modules.add(new StatusModule(reactContext, this.rootedDevice));
-        modules.add(new AccountManager(reactContext));
-        modules.add(new EncryptionUtils(reactContext));
-        modules.add(new DatabaseManager(reactContext));
-        modules.add(new UIHelper(reactContext));
-        modules.add(new LogManager(reactContext));
-        modules.add(new Utils(reactContext));
-        modules.add(new NetworkManager(reactContext));
-        modules.add(new RNSelectableTextInputModule(reactContext));
-
-        return modules;
-    }
-
-    @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-        return Arrays.<ViewManager>asList(
-                new RNSelectableTextInputViewManager()
-        );
-    }
-}

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

@@ -0,0 +1,39 @@
+package im.status.ethereum.module
+
+import com.facebook.react.ReactPackage
+import com.facebook.react.bridge.NativeModule
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.uimanager.ViewManager
+import statusgo.Statusgo
+
+class StatusPackage(private val rootedDevice: Boolean) : ReactPackage {
+
+    companion object {
+        fun getImageTLSCert(): String = Statusgo.imageServerTLSCert()
+    }
+
+    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
+        val modules = mutableListOf<NativeModule>()
+
+        modules.apply {
+            add(StatusModule(reactContext, rootedDevice))
+            add(AccountManager(reactContext))
+            add(EncryptionUtils(reactContext))
+            add(DatabaseManager(reactContext))
+            add(UIHelper(reactContext))
+            add(LogManager(reactContext))
+            add(Utils(reactContext))
+            add(NetworkManager(reactContext))
+            add(MailManager(reactContext))
+            add(RNSelectableTextInputModule(reactContext))
+        }
+
+        return modules
+    }
+
+    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
+        return listOf(
+            RNSelectableTextInputViewManager()
+        )
+    }
+}

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

@@ -1,155 +0,0 @@
-package im.status.ethereum.module;
-
-import com.facebook.react.bridge.Callback;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import android.util.Log;
-import java.util.function.Supplier;
-import java.io.File;
-import android.content.Context;
-import android.os.Environment;
-import org.json.JSONObject;
-import org.json.JSONException;
-import statusgo.Statusgo;
-
-public class Utils extends ReactContextBaseJavaModule  {
-    private static final String gethLogFileName = "geth.log";
-
-    private static final String TAG = "Utils";
-    private ReactApplicationContext reactContext;
-
-    public Utils(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.reactContext = reactContext;
-    }
-
-    @Override
-    public String getName() {
-        return "Utils";
-    }
-    public String getNoBackupDirectory() {
-        return this.getReactApplicationContext().getNoBackupFilesDir().getAbsolutePath();
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String backupDisabledDataDir() {
-        return getNoBackupDirectory();
-    }
-
-    public File getPublicStorageDirectory() {
-        final Context context = this.getReactApplicationContext();
-        // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
-        // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
-        return context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS);
-    }
-
-    public File getLogsFile() {
-        final File pubDirectory = getPublicStorageDirectory();
-        final File logFile = new File(pubDirectory, gethLogFileName);
-
-        return logFile;
-    }
-
-    public String getKeyUID(final String json) throws JSONException {
-        final JSONObject jsonObj = new JSONObject(json);
-        return jsonObj.getString("key-uid");
-    }
-
-    public String pathCombine(final String path1, final String path2) {
-        // Replace this logic with Paths.get(path1, path2) once API level 26+ becomes the minimum supported API level
-        final File file = new File(path1, path2);
-        return file.getAbsolutePath();
-    }
-
-    public String getKeyStorePath(String keyUID) {
-        final String commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore");
-        final String keydir = pathCombine(commonKeydir, keyUID);
-
-        return keydir;
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String keystoreDir() {
-        final String absRootDirPath = getNoBackupDirectory();
-        return pathCombine(absRootDirPath, "keystore");
-    }
-
-    public void migrateKeyStoreDir(final String accountData, final String password) {
-        try {
-            final String commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore");
-            final String keydir = getKeyStorePath(getKeyUID(accountData));
-            Log.d(TAG, "before migrateKeyStoreDir " + keydir);
-
-            File keydirFile = new File(keydir);
-            if(!keydirFile.exists() || keydirFile.list().length == 0) {
-                Log.d(TAG, "migrateKeyStoreDir");
-                Statusgo.migrateKeyStoreDir(accountData, password, commonKeydir, keydir);
-                Statusgo.initKeystore(keydir);
-            }
-        } catch (JSONException e) {
-            Log.e(TAG, "JSON conversion failed: " + e.getMessage());
-        }
-    }
-
-    public boolean checkAvailability() {
-        // We wait at least 10s for getCurrentActivity to return a value,
-        // otherwise we give up
-        for (int attempts = 0; attempts < 100; attempts++) {
-            if (getCurrentActivity() != null) {
-                return true;
-            }
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException ex) {
-                if (getCurrentActivity() != null) {
-                    return true;
-                }
-                Log.d(TAG, "Activity doesn't exist");
-                return false;
-            }
-        }
-
-        Log.d(TAG, "Activity doesn't exist");
-        return false;
-    }
-
-    public void executeRunnableStatusGoMethod(Supplier<String> method, Callback callback) throws JSONException {
-        if (!checkAvailability()) {
-            callback.invoke(false);
-            return;
-        }
-
-        Runnable runnableTask = () -> {
-            String res = method.get();
-            callback.invoke(res);
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(runnableTask);
-    }
-
-    @ReactMethod
-    public void validateMnemonic(final String seed, final Callback callback) throws JSONException {
-        executeRunnableStatusGoMethod(() -> Statusgo.validateMnemonic(seed), callback);
-    }
-
-    public Boolean is24Hour() {
-        return android.text.format.DateFormat.is24HourFormat(this.reactContext.getApplicationContext());
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String checkAddressChecksum(final String address) {
-        return Statusgo.checkAddressChecksum(address);
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String isAddress(final String address) {
-        return Statusgo.isAddress(address);
-    }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String toChecksumAddress(final String address) {
-        return Statusgo.toChecksumAddress(address);
-    }
-
-}

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

@@ -0,0 +1,161 @@
+package im.status.ethereum.module
+
+import android.content.Context
+import android.os.Environment
+import com.facebook.react.bridge.Callback
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableArray;
+import android.util.Log
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.File
+import java.util.function.Supplier
+import statusgo.Statusgo
+
+class Utils(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+
+    companion object {
+        private const val gethLogFileName = "geth.log"
+        private const val TAG = "Utils"
+    }
+
+    override fun getName(): String {
+        return "Utils"
+    }
+
+    fun getNoBackupDirectory(): String {
+        return reactContext.noBackupFilesDir.absolutePath
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun backupDisabledDataDir(): String {
+        return getNoBackupDirectory()
+    }
+
+    fun getPublicStorageDirectory(): File? {
+        // Environment.getExternalStoragePublicDirectory doesn't work as expected on Android Q
+        // https://developer.android.com/reference/android/os/Environment#getExternalStoragePublicDirectory(java.lang.String)
+        return reactContext.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)
+    }
+
+    fun getLogsFile(): File {
+        val pubDirectory = getPublicStorageDirectory()
+        return File(pubDirectory, gethLogFileName)
+    }
+
+    fun getKeyUID(json: String): String {
+        val jsonObj = JSONObject(json)
+        return jsonObj.getString("key-uid")
+    }
+
+    fun pathCombine(path1: String, path2: String): String {
+        val file = File(path1, path2)
+        return file.absolutePath
+    }
+
+    fun getKeyStorePath(keyUID: String): String {
+        val commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore")
+        return pathCombine(commonKeydir, keyUID)
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun keystoreDir(): String {
+        val absRootDirPath = getNoBackupDirectory()
+        return pathCombine(absRootDirPath, "keystore")
+    }
+
+    fun migrateKeyStoreDir(accountData: String, password: String) {
+        try {
+            val commonKeydir = pathCombine(getNoBackupDirectory(), "/keystore")
+            val keydir = getKeyStorePath(getKeyUID(accountData))
+            Log.d(TAG, "before migrateKeyStoreDir $keydir")
+
+            val keydirFile = File(keydir)
+            if (!keydirFile.exists() || keydirFile.list().isEmpty()) {
+                Log.d(TAG, "migrateKeyStoreDir")
+                Statusgo.migrateKeyStoreDir(accountData, password, commonKeydir, keydir)
+                Statusgo.initKeystore(keydir)
+            }
+        } catch (e: JSONException) {
+            Log.e(TAG, "JSON conversion failed: ${e.message}")
+        }
+    }
+
+    fun checkAvailability(): Boolean {
+        // We wait at least 10s for getCurrentActivity to return a value,
+        // otherwise we give up
+        for (attempts in 0 until 100) {
+            if (currentActivity != null) {
+                return true
+            }
+            try {
+                Thread.sleep(100)
+            } catch (ex: InterruptedException) {
+                if (currentActivity != null) {
+                    return true
+                }
+                Log.d(TAG, "Activity doesn't exist")
+                return false
+            }
+        }
+
+        Log.d(TAG, "Activity doesn't exist")
+        return false
+    }
+
+    fun executeRunnableStatusGoMethod(method: Supplier<String>, callback: Callback) {
+        if (!checkAvailability()) {
+            callback.invoke(false)
+            return
+        }
+
+        val runnableTask = Runnable {
+            val res = method.get()
+            callback.invoke(res)
+        }
+
+        StatusThreadPoolExecutor.getInstance().execute(runnableTask)
+    }
+
+    @ReactMethod
+    fun validateMnemonic(seed: String, callback: Callback) {
+        executeRunnableStatusGoMethod({ Statusgo.validateMnemonic(seed) }, callback)
+    }
+
+    fun is24Hour(): Boolean {
+        return android.text.format.DateFormat.is24HourFormat(reactContext.applicationContext)
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun checkAddressChecksum(address: String): String {
+        return Statusgo.checkAddressChecksum(address)
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun isAddress(address: String): String {
+        return Statusgo.isAddress(address)
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun toChecksumAddress(address: String): String {
+        return Statusgo.toChecksumAddress(address)
+    }
+
+    fun readableArrayToStringArray(r: ReadableArray): Array<String> {
+        val length = r.size()
+        val strArray = Array(length) { "" }
+
+        for (keyIndex in 0 until length) {
+            strArray[keyIndex] = r.getString(keyIndex) ?: ""
+        }
+
+        return strArray
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun validateConnectionString(connectionString: String): String {
+        return Statusgo.validateConnectionString(connectionString)
+    }
+}

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/ForegroundService.java

@@ -3,6 +3,7 @@ package im.status.ethereum.pushnotifications;
 import android.content.Context;
 import android.content.Intent;
 import android.app.Service;
+import android.content.pm.ServiceInfo;
 import android.os.IBinder;
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -78,10 +79,10 @@ public class ForegroundService extends Service {
         
 
       
-        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE);
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
         Intent stopIntent = new Intent(PushNotificationHelper.ACTION_TAP_STOP);
         PendingIntent stopPendingIntent = PendingIntent.getBroadcast(context, 0, stopIntent,
-                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
         Notification notification = new NotificationCompat.Builder(context, CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_stat_notify_status)
@@ -95,8 +96,14 @@ public class ForegroundService extends Service {
                        context.getResources().getString(R.string.stop),
                        stopPendingIntent)
             .build();
+
         // the id of the foreground notification MUST NOT be 0
-        startForeground(1, notification);
+        if (Build.VERSION.SDK_INT >= 33) {
+            startForeground(1, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
+        } else {
+            startForeground(1, notification);
+        }
+
         return START_STICKY;
     }
 }

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotificationHelper.java

@@ -68,7 +68,7 @@ public class PushNotificationHelper {
     private static final String CHANNEL_ID = "status-im-notifications";
     public static final String ACTION_DELETE_NOTIFICATION = "im.status.ethereum.module.DELETE_NOTIFICATION";
     public static final String ACTION_TAP_STOP = "im.status.ethereum.module.TAP_STOP";
-    final int flag =  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE : PendingIntent.FLAG_CANCEL_CURRENT;
+    final int flag =  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE : PendingIntent.FLAG_CANCEL_CURRENT;
 
     private NotificationManager notificationManager;
 
@@ -139,7 +139,7 @@ public class PushNotificationHelper {
     public void registerBroadcastReceiver() {
         this.intentFilter.addAction(ACTION_DELETE_NOTIFICATION);
         this.intentFilter.addAction(ACTION_TAP_STOP);
-        context.registerReceiver(notificationActionReceiver, this.intentFilter);
+        context.registerReceiver(notificationActionReceiver, this.intentFilter, Context.RECEIVER_EXPORTED);
         Log.e(LOG_TAG, "Broadcast Receiver registered");
     }
 
@@ -518,7 +518,7 @@ public class PushNotificationHelper {
                     actionIntent.setPackage(packageName);
 
                     PendingIntent pendingActionIntent = PendingIntent.getBroadcast(context, notificationID, actionIntent,
-                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
+                            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                       notification.addAction(new NotificationCompat.Action.Builder(icon, action, pendingActionIntent).build());
@@ -684,7 +684,7 @@ public class PushNotificationHelper {
 
         return output;
     }
-    
+
     private Person getPerson(Bundle bundle) {
      String name = bundle.getString("name");
 

modules/react-native-status/android/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="rnmail_dl" path="Download/" />
+    <cache-path name="rnmail_cache" path="/" />
+    <root-path name="rnmail_sdcard" path="." />
+</paths>

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

@@ -66,6 +66,9 @@ RCT_EXPORT_METHOD(restoreAccountAndLogin:(NSString *)request) {
     NSData *configData = [config dataUsingEncoding:NSUTF8StringEncoding];
     NSDictionary *configJSON = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:nil];
     NSString *relativeDataDir = [configJSON objectForKey:@"DataDir"];
+    if (relativeDataDir == nil) {
+        relativeDataDir = @"";
+    }
     NSString *absDataDir = [rootUrl.path stringByAppendingString:relativeDataDir];
     NSURL *absDataDirUrl = [NSURL fileURLWithPath:absDataDir];
     NSString *keystoreDir = [@"/keystore/" stringByAppendingString:keyUID];
@@ -192,6 +195,15 @@ RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
     callback(@[result]);
 }
 
+RCT_EXPORT_METHOD(initializeApplication:(NSString *)request
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"initializeApplication() method called");
+#endif
+    NSString *result = StatusgoInitializeApplication(request);
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
 #if DEBUG
     NSLog(@"OpenAccounts() method called");
@@ -230,4 +242,12 @@ RCT_EXPORT_METHOD(createAccountFromMnemonicAndDeriveAccountsForPaths:(NSString *
     callback(@[result]);
 }
 
+RCT_EXPORT_METHOD(createAccountFromPrivateKey:(NSString *)configJSON callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"createAccountFromPrivateKey() method called");
+#endif
+    NSString *result = StatusgoCreateAccountFromPrivateKey(configJSON);
+    callback(@[result]);
+}
+
 @end

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

@@ -94,6 +94,10 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToUtf8:(NSString *)str) {
     return StatusgoHexToUtf8(str);
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(serializeLegacyKey:(NSString *)str) {
+    return StatusgoSerializeLegacyKey(str);
+}
+
 RCT_EXPORT_METHOD(setBlankPreviewFlag:(BOOL *)newValue)
 {
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];

modules/react-native-status/ios/RCTStatus/MailManager.h

@@ -0,0 +1,9 @@
+#import <sys/utsname.h>
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <React/RCTBridgeModule.h>
+#import "RCTLog.h"
+
+@interface MailManager : NSObject <RCTBridgeModule, MFMailComposeViewControllerDelegate>
+
+@end

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

@@ -0,0 +1,207 @@
+#import <MessageUI/MessageUI.h>
+#import "MailManager.h"
+#import <React/RCTConvert.h>
+#import <React/RCTLog.h>
+#import "React/RCTBridge.h"
+#import "React/RCTEventDispatcher.h"
+
+@implementation MailManager
+{
+    NSMutableDictionary *_callbacks;
+}
+
+- (instancetype)init
+{
+    if ((self = [super init])) {
+        _callbacks = [[NSMutableDictionary alloc] init];
+    }
+    return self;
+}
+
+- (dispatch_queue_t)methodQueue
+{
+    return dispatch_get_main_queue();
+}
+
++ (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
+
+RCT_EXPORT_MODULE();
+
+RCT_EXPORT_METHOD(mail:(NSDictionary *)options
+                  callback: (RCTResponseSenderBlock)callback)
+{
+    if ([MFMailComposeViewController canSendMail])
+    {
+        MFMailComposeViewController *mail = [[MFMailComposeViewController alloc] init];
+        mail.mailComposeDelegate = self;
+        _callbacks[RCTKeyForInstance(mail)] = callback;
+
+        if (options[@"subject"]){
+            NSString *subject = [RCTConvert NSString:options[@"subject"]];
+            [mail setSubject:subject];
+        }
+
+        BOOL isHTML = NO;
+
+        if (options[@"isHTML"]){
+            isHTML = [options[@"isHTML"] boolValue];
+        }
+
+        if (options[@"body"]){
+            NSString *body = [RCTConvert NSString:options[@"body"]];
+            [mail setMessageBody:body isHTML:isHTML];
+        }
+
+        if (options[@"recipients"]){
+            NSArray *recipients = [RCTConvert NSArray:options[@"recipients"]];
+            [mail setToRecipients:recipients];
+        }
+
+        if (options[@"ccRecipients"]){
+            NSArray *ccRecipients = [RCTConvert NSArray:options[@"ccRecipients"]];
+            [mail setCcRecipients:ccRecipients];
+        }
+
+        if (options[@"bccRecipients"]){
+            NSArray *bccRecipients = [RCTConvert NSArray:options[@"bccRecipients"]];
+            [mail setBccRecipients:bccRecipients];
+        }
+        if (options[@"attachments"]) {
+            NSArray *attachments = [RCTConvert NSArray:options[@"attachments"]];
+            for (NSDictionary *attachment in attachments) {
+                if ((attachment[@"path"] || attachment[@"uri"]) && (attachment[@"type"] || attachment[@"mimeType"])) {
+                    NSString *attachmentPath = [RCTConvert NSString:attachment[@"path"]];
+                    NSString *attachmentUri = [RCTConvert NSString:attachment[@"uri"]];
+                    NSString *attachmentType = [RCTConvert NSString:attachment[@"type"]];
+                    NSString *attachmentName = [RCTConvert NSString:attachment[@"name"]];
+                    NSString *attachmentMimeType = [RCTConvert NSString:attachment[@"mimeType"]];
+
+                    // Set default filename if not specificed
+                    if (!attachmentName) {
+                        attachmentName = [[attachmentPath lastPathComponent] stringByDeletingPathExtension];
+                    }
+
+                    NSData *fileData;
+                    if (attachmentPath) {
+                        NSFileManager *fileManager = [NSFileManager defaultManager];
+                        if (![fileManager fileExistsAtPath:attachmentPath]){
+                            callback(@[[NSString stringWithFormat: @"attachment file with path '%@' does not exist", attachmentPath]]);
+                            return;
+                        }
+                        // Get the resource path and read the file using NSData
+                        fileData = [NSData dataWithContentsOfFile:attachmentPath];
+                    } else if (attachmentUri) {
+                        // Get the URI and read it using NSData
+                        NSURL *attachmentURL = [[NSURLComponents componentsWithString:attachmentUri] URL];
+                        NSError *error = nil;
+                        fileData = [NSData dataWithContentsOfURL:attachmentURL options:0 error:&error];
+                        if (!fileData) {
+                            callback(@[[NSString stringWithFormat: @"attachment file with uri '%@' does not exist", attachmentUri]]);
+                            return;
+                        }
+                    }
+
+                    // Determine the MIME type
+                    NSString *mimeType;
+                    if (attachmentType) {
+                        /*
+                         * Add additional mime types and PR if necessary. Find the list
+                         * of supported formats at http://www.iana.org/assignments/media-types/media-types.xhtml
+                         */
+                        NSDictionary *supportedMimeTypes = @{
+                            @"jpeg" : @"image/jpeg",
+                            @"jpg" : @"image/jpeg",
+                            @"png" : @"image/png",
+                            @"doc" : @"application/msword",
+                            @"docx" : @"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+                            @"ppt" : @"application/vnd.ms-powerpoint",
+                            @"pptx" : @"application/vnd.openxmlformats-officedocument.presentationml.presentation",
+                            @"html" : @"text/html",
+                            @"csv" : @"text/csv",
+                            @"pdf" : @"application/pdf",
+                            @"vcard" : @"text/vcard",
+                            @"json" : @"application/json",
+                            @"zip" : @"application/zip",
+                            @"text" : @"text/*",
+                            @"mp3" : @"audio/mpeg",
+                            @"wav" : @"audio/wav",
+                            @"aiff" : @"audio/aiff",
+                            @"flac" : @"audio/flac",
+                            @"ogg" : @"audio/ogg",
+                            @"xls" : @"application/vnd.ms-excel",
+                            @"ics" : @"text/calendar",
+                            @"xlsx" : @"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                        };
+                        if([supportedMimeTypes objectForKey:attachmentType]) {
+                            mimeType = [supportedMimeTypes objectForKey:attachmentType];
+                        } else {
+                            callback(@[[NSString stringWithFormat: @"Mime type '%@' for attachment is not handled", attachmentType]]);
+                            return;
+                        }
+                    } else if (attachmentMimeType) {
+                        mimeType = attachmentMimeType;
+                    }
+
+                    // Add attachment
+                    [mail addAttachmentData:fileData mimeType:mimeType fileName:attachmentName];
+                }
+            }
+        }
+
+        UIViewController *root = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+
+        while (root.presentedViewController) {
+            root = root.presentedViewController;
+        }
+        [root presentViewController:mail animated:YES completion:nil];
+    } else {
+        callback(@[@"not_available"]);
+    }
+}
+
+#pragma mark MFMailComposeViewControllerDelegate Methods
+
+- (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error
+{
+    NSString *key = RCTKeyForInstance(controller);
+    RCTResponseSenderBlock callback = _callbacks[key];
+    if (callback) {
+        switch (result) {
+            case MFMailComposeResultSent:
+                callback(@[[NSNull null] , @"sent"]);
+                break;
+            case MFMailComposeResultSaved:
+                callback(@[[NSNull null] , @"saved"]);
+                break;
+            case MFMailComposeResultCancelled:
+                callback(@[[NSNull null] , @"cancelled"]);
+                break;
+            case MFMailComposeResultFailed:
+                callback(@[@"failed"]);
+                break;
+            default:
+                callback(@[@"error"]);
+                break;
+        }
+        [_callbacks removeObjectForKey:key];
+    } else {
+        RCTLogWarn(@"No callback registered for mail: %@", controller.title);
+    }
+    UIViewController *ctrl = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
+    while (ctrl.presentedViewController && ctrl != controller) {
+        ctrl = ctrl.presentedViewController;
+    }
+    [ctrl dismissViewControllerAnimated:YES completion:nil];
+}
+
+#pragma mark Private
+
+static NSString *RCTKeyForInstance(id instance)
+{
+    return [NSString stringWithFormat:@"%p", instance];
+}
+
+@end

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

@@ -106,4 +106,41 @@ RCT_EXPORT_METHOD(recover:(NSString *)message
     callback(@[result]);
 }
 
+RCT_EXPORT_METHOD(getConnectionStringForExportingKeypairsKeystores:(NSString *)configJSON
+        callback:(RCTResponseSenderBlock)callback) {
+
+    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *error;
+    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
+    NSMutableDictionary *senderConfig = configDict[@"senderConfig"];
+    NSString *keyUID = senderConfig[@"loggedInKeyUid"];
+    NSURL *multiaccountKeystoreDir = [Utils getKeyStoreDirForKeyUID:keyUID];
+    NSString *keystoreDir = multiaccountKeystoreDir.path;
+
+    [senderConfig setValue:keystoreDir forKey:@"keystorePath"];
+    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];
+
+    NSString *result = StatusgoGetConnectionStringForExportingKeypairsKeystores(modifiedConfigJSON);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(inputConnectionStringForImportingKeypairsKeystores:(NSString *)cs
+        configJSON:(NSString *)configJSON
+        callback:(RCTResponseSenderBlock)callback) {
+
+    NSData *configData = [configJSON dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *error;
+    NSMutableDictionary *configDict = [NSJSONSerialization JSONObjectWithData:configData options:NSJSONReadingMutableContainers error:&error];
+    NSMutableDictionary *receiverConfig = configDict[@"receiverConfig"];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSURL *rootUrl =[[fileManager URLsForDirectory:NSLibraryDirectory inDomains:NSUserDomainMask] lastObject];
+    NSURL *multiaccountKeystoreDir = [rootUrl URLByAppendingPathComponent:@"keystore"];
+    NSString *keystoreDir = multiaccountKeystoreDir.path;
+
+    [receiverConfig setValue:keystoreDir forKey:@"keystorePath"];
+    NSString *modifiedConfigJSON = [Utils jsonStringWithPrettyPrint:NO fromDictionary:configDict];
+    NSString *result = StatusgoInputConnectionStringForImportingKeypairsKeystores(cs, modifiedConfigJSON);
+    callback(@[result]);
+}
+
 @end

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

@@ -38,9 +38,6 @@ static RCTBridge *bridge;
         return;
     }
 
-#if DEBUG
-    NSLog(@"[handleSignal] Received an event from Status-Go: %@", signal);
-#endif
     [bridge.eventDispatcher sendAppEventWithName:@"gethEvent"
                                             body:@{@"jsonEvent": signal}];
 
@@ -179,6 +176,24 @@ RCT_EXPORT_METHOD(appStateChange:(NSString *)type) {
     StatusgoAppStateChange(type);
 }
 
+RCT_EXPORT_METHOD(addCentralizedMetric:(NSString *)request
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"addCentralizedMetric() method called");
+#endif
+    NSString *result = StatusgoAddCentralizedMetric(request);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(toggleCentralizedMetrics:(NSString *)request
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"toggleCentralizedMetrics() method called");
+#endif
+    NSString *result = StatusgoToggleCentralizedMetrics(request);
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(startLocalNotifications) {
 #if DEBUG
     NSLog(@"StartLocalNotifications() method called");

modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 		CE4E31B11D86951A0033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B01D86951A0033ED64 /* Statusgo.xcframework */; };
 		E92244EB2B485F2400915F4C /* UIHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E92244E92B485F2400915F4C /* UIHelper.m */; };
 		E967A3AC2B47BD5A00FB19B2 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = E967A3AB2B47BD5A00FB19B2 /* Utils.m */; };
+		E9AEB5FE2BD8EEB100FB2926 /* MailManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */; };
 		E9BEF3602B470BF1001F6755 /* NetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9BEF35E2B470BF1001F6755 /* NetworkManager.m */; };
 		E9C33AA62B4828A60074B1C5 /* DatabaseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9C33AA52B4828A60074B1C5 /* DatabaseManager.m */; };
 		E9DB08932B4858B400F51053 /* LogManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E9DB08912B4858B400F51053 /* LogManager.m */; };
@@ -42,6 +43,8 @@
 		E92244EA2B485F2400915F4C /* UIHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIHelper.h; sourceTree = "<group>"; };
 		E967A3AA2B47BD5A00FB19B2 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
 		E967A3AB2B47BD5A00FB19B2 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
+		E9AEB5FC2BD8EEB100FB2926 /* MailManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MailManager.h; sourceTree = "<group>"; };
+		E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MailManager.m; sourceTree = "<group>"; };
 		E9BEF35E2B470BF1001F6755 /* NetworkManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NetworkManager.m; sourceTree = "<group>"; };
 		E9BEF35F2B470BF1001F6755 /* NetworkManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkManager.h; sourceTree = "<group>"; };
 		E9C33AA42B4828A60074B1C5 /* DatabaseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseManager.h; sourceTree = "<group>"; };
@@ -86,6 +89,8 @@
 		206C9F3C1D474E910063E3E6 /* Status */ = {
 			isa = PBXGroup;
 			children = (
+				E9AEB5FC2BD8EEB100FB2926 /* MailManager.h */,
+				E9AEB5FD2BD8EEB100FB2926 /* MailManager.m */,
 				E92244EA2B485F2400915F4C /* UIHelper.h */,
 				E92244E92B485F2400915F4C /* UIHelper.m */,
 				E9DB08922B4858B400F51053 /* LogManager.h */,
@@ -163,6 +168,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E9DB08932B4858B400F51053 /* LogManager.m in Sources */,
+				E9AEB5FE2BD8EEB100FB2926 /* MailManager.m in Sources */,
 				E9F5C3322B483B6C001A7F40 /* EncryptionUtils.m in Sources */,
 				E967A3AC2B47BD5A00FB19B2 /* Utils.m in Sources */,
 				E92244EB2B485F2400915F4C /* UIHelper.m in Sources */,

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

@@ -128,4 +128,8 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(toChecksumAddress:(NSString *)address) {
     return StatusgoToChecksumAddress(address);
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(validateConnectionString:(NSString *)cs) {
+    return StatusgoValidateConnectionString(cs);
+}
+
 @end

modules/react-native-status/nodejs/status.cpp

@@ -1,5 +1,9 @@
-// DO NOT EDIT: code is autogenerated by go2nodebinding from Go code.
-// https://github.com/divan/go2nodebinding
+// This code has pieces that were autogenerated but is now managed manually
+// Here lies the node bindings used for integration tests
+// These are basically C calls to exported status-go functions
+// Along 1 additional Poll function to get signals to work
+// function names registered here in init() are used in various places
+// ref -> status-mobile/src/tests/test_utils.cljs
 
 #include <node.h>
 #include <string>
@@ -298,6 +302,36 @@ void _MultiAccountStoreAccount(const FunctionCallbackInfo<Value>& args) {
 	delete c;
 }
 
+void _InitializeApplication(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 1) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for InitializeApplication")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for request")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = InitializeApplication(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+}
 
 void _InitKeystore(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
@@ -638,6 +672,38 @@ void _Sha3(const FunctionCallbackInfo<Value>& args) {
 
 }
 
+void _SerializeLegacyKey(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 1) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for SerializeLegacyKey")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'str'")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = SerializeLegacyKey(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
 void _ToChecksumAddress(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -1128,8 +1194,6 @@ Persistent<Function> r_call;
 std::queue<std::string> q;
 
 void run(char *json) {
-  printf("signal received %s\n", json);
-
   std::string str(json);
   q.push(str);
 }
@@ -1149,10 +1213,13 @@ void _PollSignal(const FunctionCallbackInfo<Value>& args) {
         v8::Local<v8::Function> func = v8::Local<v8::Function>::Cast(args[0]);
         if (!q.empty()) {
           const unsigned argc = 1;
-          v8::Local<v8::Value> argv[argc] =
-          { v8::String::NewFromUtf8(isolate,q.front().c_str()).ToLocalChecked()};
-
-          func->Call(isolate->GetCurrentContext(), v8::Null(isolate), argc, argv);
+          v8::Local<v8::Value> argv[argc] = {v8::String::NewFromUtf8(isolate, q.front().c_str()).ToLocalChecked()};
+          v8::MaybeLocal<v8::Value> result = func->Call(isolate->GetCurrentContext(), v8::Null(isolate), argc, argv);
+          if (result.IsEmpty()) {
+            isolate->ThrowException(Exception::Error(
+                String::NewFromUtf8Literal(isolate, "Error calling the callback function")));
+            return;
+          }
           q.pop();
         }
 }
@@ -1930,6 +1997,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, "initializeApplication", _InitializeApplication);
 	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
@@ -1940,6 +2008,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "checkAddressChecksum", _CheckAddressChecksum);
 	NODE_SET_METHOD(exports, "isAddress", _IsAddress);
 	NODE_SET_METHOD(exports, "sha3", _Sha3);
+	NODE_SET_METHOD(exports, "serializeLegacyKey", _SerializeLegacyKey);
 	NODE_SET_METHOD(exports, "toChecksumAddress", _ToChecksumAddress);
 	NODE_SET_METHOD(exports, "logout", _Logout);
 	NODE_SET_METHOD(exports, "hashMessage", _HashMessage);
@@ -1967,7 +2036,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "signTypedData", _SignTypedData);
 	NODE_SET_METHOD(exports, "sendTransaction", _SendTransaction);
 	NODE_SET_METHOD(exports, "appStateChange", _AppStateChange);
-    NODE_SET_METHOD(exports, "setSignalEventCallback", _SetSignalEventCallback);
+        NODE_SET_METHOD(exports, "setSignalEventCallback", _SetSignalEventCallback);
 	NODE_SET_METHOD(exports, "validateNodeConfig", _ValidateNodeConfig);
 	NODE_SET_METHOD(exports, "hashTypedData", _HashTypedData);
 	NODE_SET_METHOD(exports, "recover", _Recover);

nix/deps/clojure/deps.json

@@ -1,4 +1,13 @@
 [
+  {
+    "path": "aopalliance/aopalliance/1.0/aopalliance-1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "0235ba8b489512805ac13a8f9ea77a1ca5ebe3e8",
+      "sha256": "023a6xwv1kd9c4dq9jrsbvvj6398hgbr302w7h8kzkgd1xkyrp8a"
+    }
+  },
+
   {
     "path": "args4j/args4j/2.33/args4j-2.33",
     "host": "https://repo1.maven.org/maven2",
@@ -99,20 +108,20 @@
   },
 
   {
-    "path": "cider/piggieback/0.5.2/piggieback-0.5.2",
+    "path": "cider/piggieback/0.4.1/piggieback-0.4.1",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
-      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
+      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
+      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
     }
   },
 
   {
-    "path": "clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07",
+    "path": "clj-kondo/clj-kondo/2024.03.13/clj-kondo-2024.03.13",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "9bf516b973a0b77d7dc5a3c6c84a884e3470e7b7",
-      "sha256": "1qkw5ryqdzy4wl3xbr0r72ikrch75z5vh1dny569y3jlc888gkv8"
+      "sha1": "adec398a95322f3a27baf0a92b658493335464d1",
+      "sha256": "0r97hsj7m3qc12xwyxx6m1a71gqp5aiy99imcf8r0nz2dnjmj0kz"
     }
   },
 
@@ -152,6 +161,42 @@
     }
   },
 
+  {
+    "path": "com/cognitect/aws/api/0.8.612/api-0.8.612",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "6bf53a6a318693e086bec6246a63b193f981b386",
+      "sha256": "174csbi2whfqqw1pnna1a7pxwfa3q39marrs0sqjrwsvzqkwakvl"
+    }
+  },
+
+  {
+    "path": "com/cognitect/aws/endpoints/1.1.12.321/endpoints-1.1.12.321",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "3bec2d7c7fe3b22b709e3ef8244d8f34406f3a8d",
+      "sha256": "18mz7n8f07ki35h5v7v60rw9fh02fayda9l9cfa7bjy7w4a1yl1f"
+    }
+  },
+
+  {
+    "path": "com/cognitect/aws/s3/822.2.1145.0/s3-822.2.1145.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "0c4d7c1bc3baa4a05c7ebdf6b672259f56a16d7e",
+      "sha256": "0fhgikpn4ns494gaq1y8gch95silx1snvkg1n62ysnf1zyk42ckh"
+    }
+  },
+
+  {
+    "path": "com/cognitect/http-client/1.0.115/http-client-1.0.115",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "1a84a105c286d00557cc6c3e96932e40439b387a",
+      "sha256": "0k2dnyx4jywgzfizz9i9yb2v04cvzbqvyhyp2nv1pll0blv8h38v"
+    }
+  },
+
   {
     "path": "com/cognitect/transit-clj/1.0.329/transit-clj-1.0.329",
     "host": "https://repo1.maven.org/maven2",
@@ -224,6 +269,24 @@
     }
   },
 
+  {
+    "path": "com/github/jpmonettas/flow-storm-inst/3.7.5/flow-storm-inst-3.7.5",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "c76d1e07f3914d3f1c669d1aadc469037e7cff00",
+      "sha256": "0xzygzibqslhsl90zxfm6k2izmvzrm5wixrb0xzfcihf9bwn9nya"
+    }
+  },
+
+  {
+    "path": "com/github/jpmonettas/hansel/0.1.78/hansel-0.1.78",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "a4d916f9882f748201003880d2ee440e448b912f",
+      "sha256": "0d3x5pab6p4mykmxhspz17w4zwcp52g7gmzma3vqsn4ym24xr5qm"
+    }
+  },
+
   {
     "path": "com/google/auto/value/auto-value-annotations/1.6/auto-value-annotations-1.6",
     "host": "https://repo1.maven.org/maven2",
@@ -251,6 +314,15 @@
     }
   },
 
+  {
+    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
+      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
+    }
+  },
+
   {
     "path": "com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0",
     "host": "https://repo1.maven.org/maven2",
@@ -287,6 +359,15 @@
     }
   },
 
+  {
+    "path": "com/google/inject/guice/4.2.2/guice-4.2.2-no_aop",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "fa13659f9128f4c011c8e1d06f137083b4876377",
+      "sha256": "1zxg79l9jv86ar71pmw3abr43dgrgjz2hwbzifrx5909hsr5ykqg"
+    }
+  },
+
   {
     "path": "com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3",
     "host": "https://repo1.maven.org/maven2",
@@ -324,11 +405,38 @@
   },
 
   {
-    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
+    "path": "commons-codec/commons-codec/1.15/commons-codec-1.15",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
-      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
+      "sha1": "49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d",
+      "sha256": "0qzd8v96j4x7jjcfpvvdh9ar1xhwxpxi2rh51nzhj0br7bbgdsdk"
+    }
+  },
+
+  {
+    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
+      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
+    }
+  },
+
+  {
+    "path": "commons-io/commons-io/2.11.0/commons-io-2.11.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "a2503f302b11ebde7ebc3df41daebe0e4eea3689",
+      "sha256": "020946yakki3qzc652arfndzi594drxanidz9bawbb6vhxnjy6wn"
+    }
+  },
+
+  {
+    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
+      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
     }
   },
 
@@ -368,42 +476,6 @@
     }
   },
 
-  {
-    "path": "commons-codec/commons-codec/1.15/commons-codec-1.15",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d",
-      "sha256": "0qzd8v96j4x7jjcfpvvdh9ar1xhwxpxi2rh51nzhj0br7bbgdsdk"
-    }
-  },
-
-  {
-    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
-      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
-    }
-  },
-
-  {
-    "path": "commons-io/commons-io/2.11.0/commons-io-2.11.0",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "a2503f302b11ebde7ebc3df41daebe0e4eea3689",
-      "sha256": "020946yakki3qzc652arfndzi594drxanidz9bawbb6vhxnjy6wn"
-    }
-  },
-
-  {
-    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
-      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
-    }
-  },
-
   {
     "path": "crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1",
     "host": "https://repo.clojars.org",
@@ -494,6 +566,15 @@
     }
   },
 
+  {
+    "path": "io/github/clojure/tools.build/0.9.4/tools.build-0.9.4",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "5d0a9ffeae76e1afa5b14ecaf6faffadea77dffd",
+      "sha256": "1vivf7p05f30bcsiqn175df9vlxfvfpyx0z1snnfgin5mf6nhniq"
+    }
+  },
+
   {
     "path": "io/methvin/directory-watcher/0.17.1/directory-watcher-0.17.1",
     "host": "https://repo1.maven.org/maven2",
@@ -521,6 +602,15 @@
     }
   },
 
+  {
+    "path": "javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "934c04d3cfef185a8008e7bf34331b79730a9d43",
+      "sha256": "16xbi6mz75r1maw116njab6ln7hm9mhwrxshav4msmfdbccsajz0"
+    }
+  },
+
   {
     "path": "javax/annotation/jsr250-api/1.0/jsr250-api-1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -530,6 +620,15 @@
     }
   },
 
+  {
+    "path": "javax/inject/javax.inject/1/javax.inject-1",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "6975da39a7040257bd51d21a231b76c915872d38  /home/maven/repository-staging/to-ibiblio/maven2/javax/inject/javax.inject/1/javax.inject-1.jar",
+      "sha256": "1zz7gnahy2352345411rjlhsf64ikkc6z49dqcv1cj0clm271iwi"
+    }
+  },
+
   {
     "path": "javax/servlet/servlet-api/2.5/servlet-api-2.5",
     "host": "https://repo1.maven.org/maven2",
@@ -603,11 +702,11 @@
   },
 
   {
-    "path": "nrepl/nrepl/0.9.0/nrepl-0.9.0",
+    "path": "nrepl/nrepl/1.0.0/nrepl-1.0.0",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "49beada131959f08f9a20899affbd1b10c03a668",
-      "sha256": "1phak0479s27ffw9wzz7pi8cqqs6ipsm15dhgw9szxxcfhx529qa"
+      "sha1": "f47774c43493efdc879d36b95ebd67ea0d9c890a",
+      "sha256": "1fx5ssmixgqmklliw0ng8fjz41kkhys56x8dbwv9yqrfzws9f2x3"
     }
   },
 
@@ -620,15 +719,6 @@
     }
   },
 
-  {
-    "path": "org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "ea0a0475fb6dfcdcf48b30410fd9d4f5c80df07e",
-      "sha256": "0mnj5v660qvmrsi1m6z0dnykw3df8f1213byzp45l2wqgbgk1dfs"
-    }
-  },
-
   {
     "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
     "host": "https://repo1.maven.org/maven2",
@@ -638,6 +728,222 @@
     }
   },
 
+  {
+    "path": "org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "ea0a0475fb6dfcdcf48b30410fd9d4f5c80df07e",
+      "sha256": "0mnj5v660qvmrsi1m6z0dnykw3df8f1213byzp45l2wqgbgk1dfs"
+    }
+  },
+
+  {
+    "path": "org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "c6842c86792ff03b9f1d1fe2aab8dc23aa6c6f0e",
+      "sha256": "0kp9qwqmqp45axxddf9h8ai9yap2j86dl4il366py0vc902dj6fr"
+    }
+  },
+
+  {
+    "path": "org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada",
+      "sha256": "0hzp3vrxbnyc6w86v671wp0zchb634rgrwwcc00m0skcarm05sbg"
+    }
+  },
+
+  {
+    "path": "org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "7f2e0c573eaa7a74bac2e89b359e1f73d92a0a1d",
+      "sha256": "0hmi3c0p5a2m2v53i0fqmdqm3677q2fz6n6ydpwi16j9ih4fvfiw"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "1637b7e8fc392e389752e79b827b883629285626",
+      "sha256": "0ar5p715427zbqdl6bvkkr926s7xmp9vpc93m1v15qsgyp3a88ny"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-builder-support/3.8.6/maven-builder-support-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "4d22a3faa8880efef2e960bb8a00c2a0b351c46a",
+      "sha256": "1kll3ln7mx7mvbnc8s718fadcc1qckz7nxgqcfg0723fyd9rfg9x"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-core/3.8.6/maven-core-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f945f1f19452214d360d453d9357275313f1cfd9",
+      "sha256": "1qaqyrxr1b2sz6d6amllynxw8c6cviydy1k8pi6ghlalipd515a3"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-model/3.8.6/maven-model-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "8ad31867c493c63ac60a3fa42356a72d20f8457b",
+      "sha256": "1c129h6n5daibjksa652ywbzji0fy4pd53qwk46bvsp7s326v60k"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-model-builder/3.8.6/maven-model-builder-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "8323a726c657becbffc8ea807970935dde3e3903",
+      "sha256": "1fyf717l3aa1jzwq0qss2i4d1m1rrpg6chq0sw6fr5319vmp98sw"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-plugin-api/3.8.6/maven-plugin-api-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "4138e2e9b39f364902ac263888feb7b2407a298e",
+      "sha256": "02ppxjnx9zly3dq7hwvh3x7jsmapirhsfznl9grid7r185h7yc9c"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-repository-metadata/3.8.6/maven-repository-metadata-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "c60a7640e1b829e60f8791b5edf3cf56a6556aca",
+      "sha256": "1zgasjbx3k0l3k7x2m2bkjsbgwnp5z3ywa4d8vmp46x85xk1y3m7"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-resolver-provider/3.8.6/maven-resolver-provider-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "c6dadedc9f6b5c1c02d0a93afd1857460b0f501d",
+      "sha256": "1a9ymv2hy7509hgib75g95my1xh6i9l7pjzzl14l3a3b6kqapcgv"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-settings/3.8.6/maven-settings-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "9ba5114c6c61c66fbc6b93c73085dc5b15585524",
+      "sha256": "0qcakn4g2h68s4s8blllw2889bhiqs8cr5056ywj8i954yhyzp36"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/maven-settings-builder/3.8.6/maven-settings-builder-3.8.6",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "e5c92138dffd1f9e5454cd8224cf8e18253b1803",
+      "sha256": "1f44w8kz8v8k8an2n3i6lk48pb6sgjal6lcprzywash5qn4khnar"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/resolver/maven-resolver-api/1.8.2/maven-resolver-api-1.8.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "af6c5d8660e3c127c3987c385069d301848800a2",
+      "sha256": "0pziii8ys35i4zi0sxw652pd04d2chr3hilpagf0qqpnah2qdf7n"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/resolver/maven-resolver-connector-basic/1.8.2/maven-resolver-connector-basic-1.8.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "013b77ee054cd269a7e14667419d202799db18a2",
+      "sha256": "0w7im7wimjlzsdnvwsfvbji2i9sjaqc9xydb86qk3l3mg3cg2cbn"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/resolver/maven-resolver-impl/1.8.2/maven-resolver-impl-1.8.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "5f08b1e7d0bc89d8254cd46881a5e228c98303df",
+      "sha256": "0slzdrhjhxl41lghrg3b0cxj07zqmmgkf5kqh1g5hksbplyy00n7"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/resolver/maven-resolver-named-locks/1.8.2/maven-resolver-named-locks-1.8.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "6d81987c220cdb9672f15a1f2ee3e4ba9f80d50f",
+      "sha256": "1wf3xzv4xd7d21km0328s519kivaw1953mc33yq0mpdyarwhb6il"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/resolver/maven-resolver-spi/1.8.2/maven-resolver-spi-1.8.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "0d0768a341173c2ef88e8dbcab2f30ebfe7ef526",
+      "sha256": "111vahiwcbaa28w98ksy8q3r23m7gdkqrr4bpy2jxd3vrazaq0d3"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/resolver/maven-resolver-transport-file/1.8.2/maven-resolver-transport-file-1.8.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "b9a7004de9850fe9dcff8325c3d51ef4e387ef70",
+      "sha256": "0li1332vq03w11wdbni52qgkl2k6qdhskmfsdycqdqh9xm7c3f4c"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/resolver/maven-resolver-transport-http/1.8.2/maven-resolver-transport-http-1.8.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "dbc0b6f022c51857fb801ba135c30af056b4c071",
+      "sha256": "0q0hhvwwfilzkvrza6czv4qhvcjh9shxaych2yah0nd6kvmlslsh"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/resolver/maven-resolver-util/1.8.2/maven-resolver-util-1.8.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "cfb9b2e4c71d2a819aa4519800c9687c74b71584",
+      "sha256": "0jkvz7z07qsyp4i8p36n6zb53vmkh765fj4d3q7p8rbhnc601k52"
+    }
+  },
+
+  {
+    "path": "org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f87a61adb1e12a00dcc6cc6005a51e693aa7c4ac",
+      "sha256": "1nkdvyywfzbpd2ikpcrqb3zbz71rxc9gdqzsp0j0s172l32xj9br"
+    }
+  },
+
+  {
+    "path": "org/babashka/sci/0.8.41/sci-0.8.41",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "e8d59dc588a1e1f0c62c21fb47c093eeed043f04",
+      "sha256": "1lhv283fs0bnqbj1jhfgyy2rv6hspnhdgsiklqy3rqxrqbnrww6w"
+    }
+  },
+
   {
     "path": "org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2",
     "host": "https://repo.clojars.org",
@@ -647,15 +953,6 @@
     }
   },
 
-  {
-    "path": "org/babashka/sci/0.7.38/sci-0.7.38",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "ef2d8c74065b9a7d685a11bff017676db308a923",
-      "sha256": "04pkxwcgkd1p4f4rszsr6pp18fl0vni1az47a390llrhyyrjcckn"
-    }
-  },
-
   {
     "path": "org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0",
     "host": "https://repo1.maven.org/maven2",
@@ -728,6 +1025,15 @@
     }
   },
 
+  {
+    "path": "org/clojure/data.int-map/1.2.1/data.int-map-1.2.1",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "9e7e4e17329ecd46e92384d9e8475d77800d204e",
+      "sha256": "055ip8l2y9004cydzz4i08p1ihlm5dz5fpknrln87ds9z9i5hiqh"
+    }
+  },
+
   {
     "path": "org/clojure/data.json/2.4.0/data.json-2.4.0",
     "host": "https://repo1.maven.org/maven2",
@@ -747,11 +1053,11 @@
   },
 
   {
-    "path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541",
+    "path": "org/clojure/data.xml/0.2.0-alpha8/data.xml-0.2.0-alpha8",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "f5ea82eb1309b81ada6a14371bb848323c65e38b",
-      "sha256": "0jk9v4bfrxvz6wq1s86msry2mf47nwcjfplnn41yabqc44g82hva"
+      "sha1": "c3dd8907b0a63a67082bc3091e304d9e1676d4b0",
+      "sha256": "159spfgsn0grlfszzybycyrg6apmv2622aqgc5nc6m7ndm7hrcdm"
     }
   },
 
@@ -764,6 +1070,24 @@
     }
   },
 
+  {
+    "path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f5ea82eb1309b81ada6a14371bb848323c65e38b",
+      "sha256": "0jk9v4bfrxvz6wq1s86msry2mf47nwcjfplnn41yabqc44g82hva"
+    }
+  },
+
+  {
+    "path": "org/clojure/java.classpath/1.0.0/java.classpath-1.0.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "015d06d1b304ac23104333bc8492a11bcc2e87e4",
+      "sha256": "0vvxzv3vagwhx3zw4w30xhz2kxf1zbggnhn75kymqpja6080wkn1"
+    }
+  },
+
   {
     "path": "org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0",
     "host": "https://repo1.maven.org/maven2",
@@ -791,15 +1115,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "449691b55d7d526258ce02c69b4699f2897c494d",
-      "sha256": "0phfs1z1scvdi00348zjh223xncmgrkmlrnbca4dh7lk701gy34i"
-    }
-  },
-
   {
     "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -809,6 +1124,15 @@
     }
   },
 
+  {
+    "path": "org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "449691b55d7d526258ce02c69b4699f2897c494d",
+      "sha256": "0phfs1z1scvdi00348zjh223xncmgrkmlrnbca4dh7lk701gy34i"
+    }
+  },
+
   {
     "path": "org/clojure/tools.cli/1.0.206/tools.cli-1.0.206",
     "host": "https://repo1.maven.org/maven2",
@@ -819,11 +1143,29 @@
   },
 
   {
-    "path": "org/clojure/tools.logging/1.1.0/tools.logging-1.1.0",
+    "path": "org/clojure/tools.deps/0.17.1297/tools.deps-0.17.1297",
     "host": "https://repo1.maven.org/maven2",
     "jar": {
-      "sha1": "84cb5d00caa9df2ee504d46f6107f4708271f619",
-      "sha256": "0x2zzivn38z179lxkw9wbi9n9qwsf466lrd9y27khdz7wbxhscb5"
+      "sha1": "7f27f66575190ddd5a343a77bba6911b0b4ec620",
+      "sha256": "0mlf7k0s26v4dx25hmix79002ghzar7jynnvcm9pcp56dsg4k78n"
+    }
+  },
+
+  {
+    "path": "org/clojure/tools.gitlibs/2.5.190/tools.gitlibs-2.5.190",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f300f872ac84711ba6df61cbba923c515c289068",
+      "sha256": "1i3jqzgfqiysy7np21gwrds32aay6a5p1xfnc3xp1jv30nnqd4bs"
+    }
+  },
+
+  {
+    "path": "org/clojure/tools.logging/1.2.4/tools.logging-1.2.4",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "3a85764aa30c434a5b0375a2ee72924aa040fa66",
+      "sha256": "0a8riw23pfkiiyz98ccmljpbw1z13mxl73pdgyz80j93s0y0mzj6"
     }
   },
 
@@ -836,6 +1178,15 @@
     }
   },
 
+  {
+    "path": "org/clojure/tools.namespace/1.4.4/tools.namespace-1.4.4",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "ba1078e3fe6ebc33119a7c09722afa9f708aef1f",
+      "sha256": "01b3v2mii51krravn2rh1b9ysg9ph0mlb9c2dfbv0k6mckynhy04"
+    }
+  },
+
   {
     "path": "org/clojure/tools.reader/1.3.7/tools.reader-1.3.7",
     "host": "https://repo1.maven.org/maven2",
@@ -845,6 +1196,114 @@
     }
   },
 
+  {
+    "path": "org/codehaus/plexus/plexus-cipher/2.0/plexus-cipher-2.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "425ea8e534716b4bff1ea90f39bd76be951d651b",
+      "sha256": "0fi0x8dq1skmxy8w7yhij7kshxig592k31zxmlgddzwyb9f1nzws"
+    }
+  },
+
+  {
+    "path": "org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "8587e80fcb38e70b70fae8d5914b6376bfad6259",
+      "sha256": "0j9m9zbw152gdqvigwh2l922z4nrxzbdbgky86f7qy4zqig7rxsj"
+    }
+  },
+
+  {
+    "path": "org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "2f2147a6cc6a119a1b51a96f31d45c557f6244b9",
+      "sha256": "1b5c6ay7nbphafqs6h7apars9xis0j06011685cgkg5mx5y63qxx"
+    }
+  },
+
+  {
+    "path": "org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "25b919c664b79795ccde0ede5cee0fd68b544197",
+      "sha256": "0qi633bwjwwaadmsrzjg6i0abpxkkz7xzg34llz112bqw4n43ddk"
+    }
+  },
+
+  {
+    "path": "org/codehaus/plexus/plexus-sec-dispatcher/2.0/plexus-sec-dispatcher-2.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f89c5080614ffd0764e49861895dbedde1b47237",
+      "sha256": "1szwmkvlw8jf4fcvprfwicc85gy4l81v1055vmv02y2c1jb3jcc7"
+    }
+  },
+
+  {
+    "path": "org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "9b41b2b76b1bfe3774411fe22f5868058a9fc822",
+      "sha256": "0aig48q1jihh02l2glj8wp1qi74a6llvkf9fklj4z2aspv6hymsb"
+    }
+  },
+
+  {
+    "path": "org/eclipse/jetty/jetty-client/9.4.48.v20220622/jetty-client-9.4.48.v20220622",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "fc2e953a7030045e1ca467d57e200856a170848e",
+      "sha256": "058x9p1k8r5miwyn2za86nz27mbnmnk956crfmi2jsyk004zx2bz"
+    }
+  },
+
+  {
+    "path": "org/eclipse/jetty/jetty-http/9.4.48.v20220622/jetty-http-9.4.48.v20220622",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "8cb235e70bda0c5e97a41e7ee0ea33ee7f5bcc6a",
+      "sha256": "0phpz22cj5n8950pdbb97fwbmr4f4l8h8lvh0kg8ya159j0196f9"
+    }
+  },
+
+  {
+    "path": "org/eclipse/jetty/jetty-io/9.4.48.v20220622/jetty-io-9.4.48.v20220622",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "b09b55209d0a304e542f779750a01f6914dc55e7",
+      "sha256": "0iwb1d3a18yl2x6sbawi2cl5k6d24gmx2rmj1fks01c96jh60bsd"
+    }
+  },
+
+  {
+    "path": "org/eclipse/jetty/jetty-util/9.4.48.v20220622/jetty-util-9.4.48.v20220622",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "7efc06f7ec0ff33d8c219bcc8c7415280c103669",
+      "sha256": "11rbr3mayczff851l34ccbmkpi71dzy2havrqalvxd54ki2gvji4"
+    }
+  },
+
+  {
+    "path": "org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "d4265dd4f0f1d7a06d80df5a5f475d5ff9c17140",
+      "sha256": "04ys5z436vd2m8ipn5fifmwbvpcif7250k9sc2yx5qfwph8416f5"
+    }
+  },
+
+  {
+    "path": "org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "d71996bb2e536f966b3b70e647067fff3b73d32f",
+      "sha256": "1157yqjxvr24wpgy4zi4mnjpm3jjlmcmrmd7ywh6z0khdl4n2k3y"
+    }
+  },
+
   {
     "path": "org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA",
     "host": "https://repo1.maven.org/maven2",
@@ -854,6 +1313,15 @@
     }
   },
 
+  {
+    "path": "org/java-websocket/Java-WebSocket/1.5.3/Java-WebSocket-1.5.3",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "9c26b6a6e732a1242db576a50dc3a12e446e2717",
+      "sha256": "0gvsbr49lr8ylv4k8gsnd9wyfc4gs5wr15klrmnyfmxnr4fw4vsd"
+    }
+  },
+
   {
     "path": "org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final",
     "host": "https://repo1.maven.org/maven2",
@@ -917,6 +1385,15 @@
     }
   },
 
+  {
+    "path": "org/slf4j/jcl-over-slf4j/1.7.36/jcl-over-slf4j-1.7.36",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "d877e195a05aca4a2f1ad2ff14bfec1393af4b5e",
+      "sha256": "15ci04f0g0avrfih736hb6pg1jsfx5ciy4jx6qbjqxr3sa7wlmxb"
+    }
+  },
+
   {
     "path": "org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9",
     "host": "https://repo1.maven.org/maven2",
@@ -962,6 +1439,15 @@
     }
   },
 
+  {
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+    }
+  },
+
   {
     "path": "re-com/re-com/2.8.0/re-com-2.8.0",
     "host": "https://repo.clojars.org",
@@ -972,11 +1458,20 @@
   },
 
   {
-    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
+    "path": "refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "b7135a76432b8141027ba1f4eb6bb15a36acfb7c",
-      "sha256": "16wi01z0j4wn04kldwzxvj0pd9dianjyb000nv5611ikhxk1qrps"
+      "sha1": "f949af92dd1d6fef59d7447bd0cb62118e34eca1",
+      "sha256": "0dml9yvjmji6xk2sk3cdmkvvnh13rw29szxxl363hap8yg28xcs1"
+    }
+  },
+
+  {
+    "path": "re-frame/re-frame/1.4.3/re-frame-1.4.3",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "74e132cc593ed2d72a5d4874954c58677a905f0e",
+      "sha256": "1xdmbjb0gv6dby98y1nx3brz9sdkfzxz9cjk8ajcr1f4zabcaapb"
     }
   },
 
@@ -998,24 +1493,6 @@
     }
   },
 
-  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
-    }
-  },
-
-  {
-    "path": "refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "f949af92dd1d6fef59d7447bd0cb62118e34eca1",
-      "sha256": "0dml9yvjmji6xk2sk3cdmkvvnh13rw29szxxl363hap8yg28xcs1"
-    }
-  },
-
   {
     "path": "ring-cors/ring-cors/0.1.8/ring-cors-0.1.8",
     "host": "https://repo.clojars.org",

nix/deps/clojure/deps.list

@@ -1,3 +1,4 @@
+aopalliance/aopalliance/1.0/aopalliance-1.0.jar
 args4j/args4j/2.33/args4j-2.33.jar
 babashka/fs/0.2.16/fs-0.2.16.jar
 bidi/bidi/2.1.6/bidi-2.1.6.jar
@@ -9,12 +10,16 @@ borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cheshire/cheshire/5.11.0/cheshire-5.11.0.jar
 cider/cider-nrepl/0.31.0/cider-nrepl-0.31.0.jar
-cider/piggieback/0.5.2/piggieback-0.5.2.jar
-clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07.jar
+cider/piggieback/0.4.1/piggieback-0.4.1.jar
+clj-kondo/clj-kondo/2024.03.13/clj-kondo-2024.03.13.jar
 cljs-bean/cljs-bean/1.9.0/cljs-bean-1.9.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
 com/bhauman/cljs-test-display/0.1.1/cljs-test-display-0.1.1.jar
+com/cognitect/aws/api/0.8.612/api-0.8.612.jar
+com/cognitect/aws/endpoints/1.1.12.321/endpoints-1.1.12.321.jar
+com/cognitect/aws/s3/822.2.1145.0/s3-822.2.1145.0.jar
+com/cognitect/http-client/1.0.115/http-client-1.0.115.jar
 com/cognitect/transit-clj/1.0.329/transit-clj-1.0.329.jar
 com/cognitect/transit-cljs/0.8.280/transit-cljs-0.8.280.jar
 com/cognitect/transit-java/1.0.362/transit-java-1.0.362.jar
@@ -23,26 +28,29 @@ com/fasterxml/jackson/core/jackson-core/2.13.3/jackson-core-2.13.3.jar
 com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.13.3/jackson-dataformat-cbor-2.13.3.jar
 com/fasterxml/jackson/dataformat/jackson-dataformat-smile/2.13.3/jackson-dataformat-smile-2.13.3.jar
 com/github/javaparser/javaparser-core/3.25.3/javaparser-core-3.25.3.jar
+com/github/jpmonettas/flow-storm-inst/3.7.5/flow-storm-inst-3.7.5.jar
+com/github/jpmonettas/hansel/0.1.78/hansel-0.1.78.jar
 com/google/auto/value/auto-value-annotations/1.6/auto-value-annotations-1.6.jar
 com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 com/google/code/gson/gson/2.9.1/gson-2.9.1.jar
+com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
 com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
 com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
 com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar
 com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+com/google/inject/guice/4.2.2/guice-4.2.2-no_aop.jar
 com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
 com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802.jar
 com/google/protobuf/protobuf-java/3.21.12/protobuf-java-3.21.12.jar
 com/google/re2j/re2j/1.3/re2j-1.3.jar
-com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
-com/taoensso/encore/3.68.0/encore-3.68.0.jar
-com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
-com/taoensso/truss/1.11.0/truss-1.11.0.jar
-com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
 commons-codec/commons-codec/1.15/commons-codec-1.15.jar
 commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
 commons-io/commons-io/2.11.0/commons-io-2.11.0.jar
 compojure/compojure/1.5.2/compojure-1.5.2.jar
+com/taoensso/encore/3.68.0/encore-3.68.0.jar
+com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
+com/taoensso/truss/1.11.0/truss-1.11.0.jar
+com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
 crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1.jar
 crypto-random/crypto-random/1.2.1/crypto-random-1.2.1.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
@@ -53,10 +61,13 @@ hiccup/hiccup/1.0.5/hiccup-1.0.5.jar
 http-kit/http-kit/2.2.0/http-kit-2.2.0.jar
 instaparse/instaparse/1.4.0/instaparse-1.4.0.jar
 io/aviso/pretty/1.4.4/pretty-1.4.4.jar
+io/github/clojure/tools.build/0.9.4/tools.build-0.9.4.jar
 io/methvin/directory-watcher/0.17.1/directory-watcher-0.17.1.jar
 io/replikativ/datalog-parser/0.2.25/datalog-parser-0.2.25.jar
 io/undertow/undertow-core/2.3.10.Final/undertow-core-2.3.10.Final.jar
+javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar
 javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar
+javax/inject/javax.inject/1/javax.inject-1.jar
 javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
 javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar
 medley/medley/0.8.2/medley-0.8.2.jar
@@ -65,12 +76,34 @@ mvxcvi/arrangement/2.1.0/arrangement-2.1.0.jar
 net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
 net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
 nrepl/bencode/1.1.0/bencode-1.1.0.jar
-nrepl/nrepl/0.9.0/nrepl-0.9.0.jar
+nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
 nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
-org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/apache/ant/ant/1.10.11/ant-1.10.11.jar
+org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
+org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar
+org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar
+org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15.jar
+org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar
+org/apache/maven/maven-builder-support/3.8.6/maven-builder-support-3.8.6.jar
+org/apache/maven/maven-core/3.8.6/maven-core-3.8.6.jar
+org/apache/maven/maven-model/3.8.6/maven-model-3.8.6.jar
+org/apache/maven/maven-model-builder/3.8.6/maven-model-builder-3.8.6.jar
+org/apache/maven/maven-plugin-api/3.8.6/maven-plugin-api-3.8.6.jar
+org/apache/maven/maven-repository-metadata/3.8.6/maven-repository-metadata-3.8.6.jar
+org/apache/maven/maven-resolver-provider/3.8.6/maven-resolver-provider-3.8.6.jar
+org/apache/maven/maven-settings/3.8.6/maven-settings-3.8.6.jar
+org/apache/maven/maven-settings-builder/3.8.6/maven-settings-builder-3.8.6.jar
+org/apache/maven/resolver/maven-resolver-api/1.8.2/maven-resolver-api-1.8.2.jar
+org/apache/maven/resolver/maven-resolver-connector-basic/1.8.2/maven-resolver-connector-basic-1.8.2.jar
+org/apache/maven/resolver/maven-resolver-impl/1.8.2/maven-resolver-impl-1.8.2.jar
+org/apache/maven/resolver/maven-resolver-named-locks/1.8.2/maven-resolver-named-locks-1.8.2.jar
+org/apache/maven/resolver/maven-resolver-spi/1.8.2/maven-resolver-spi-1.8.2.jar
+org/apache/maven/resolver/maven-resolver-transport-file/1.8.2/maven-resolver-transport-file-1.8.2.jar
+org/apache/maven/resolver/maven-resolver-transport-http/1.8.2/maven-resolver-transport-http-1.8.2.jar
+org/apache/maven/resolver/maven-resolver-util/1.8.2/maven-resolver-util-1.8.2.jar
+org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4.jar
+org/babashka/sci/0.8.41/sci-0.8.41.jar
 org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2.jar
-org/babashka/sci/0.7.38/sci-0.7.38.jar
 org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
 org/clojure/clojure/1.11.1/clojure-1.11.1.jar
 org/clojure/clojurescript/1.11.60/clojurescript-1.11.60.jar
@@ -79,20 +112,39 @@ org/clojure/core.cache/1.0.225/core.cache-1.0.225.jar
 org/clojure/core.memoize/1.0.253/core.memoize-1.0.253.jar
 org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2.jar
 org/clojure/core.specs.alpha/0.2.62/core.specs.alpha-0.2.62.jar
+org/clojure/data.int-map/1.2.1/data.int-map-1.2.1.jar
 org/clojure/data.json/2.4.0/data.json-2.4.0.jar
 org/clojure/data.priority-map/1.1.0/data.priority-map-1.1.0.jar
-org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
+org/clojure/data.xml/0.2.0-alpha8/data.xml-0.2.0-alpha8.jar
 org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
+org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
+org/clojure/java.classpath/1.0.0/java.classpath-1.0.0.jar
 org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0.jar
 org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar
 org/clojure/test.check/1.1.1/test.check-1.1.1.jar
-org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
 org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0.jar
+org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
 org/clojure/tools.cli/1.0.206/tools.cli-1.0.206.jar
-org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
+org/clojure/tools.deps/0.17.1297/tools.deps-0.17.1297.jar
+org/clojure/tools.gitlibs/2.5.190/tools.gitlibs-2.5.190.jar
+org/clojure/tools.logging/1.2.4/tools.logging-1.2.4.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
+org/clojure/tools.namespace/1.4.4/tools.namespace-1.4.4.jar
 org/clojure/tools.reader/1.3.7/tools.reader-1.3.7.jar
+org/codehaus/plexus/plexus-cipher/2.0/plexus-cipher-2.0.jar
+org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.jar
+org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.jar
+org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.jar
+org/codehaus/plexus/plexus-sec-dispatcher/2.0/plexus-sec-dispatcher-2.0.jar
+org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar
+org/eclipse/jetty/jetty-client/9.4.48.v20220622/jetty-client-9.4.48.v20220622.jar
+org/eclipse/jetty/jetty-http/9.4.48.v20220622/jetty-http-9.4.48.v20220622.jar
+org/eclipse/jetty/jetty-io/9.4.48.v20220622/jetty-io-9.4.48.v20220622.jar
+org/eclipse/jetty/jetty-util/9.4.48.v20220622/jetty-util-9.4.48.v20220622.jar
+org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.jar
+org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.jar
 org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar
+org/java-websocket/Java-WebSocket/1.5.3/Java-WebSocket-1.5.3.jar
 org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar
 org/jboss/threads/jboss-threads/3.5.0.Final/jboss-threads-3.5.0.Final.jar
 org/jboss/xnio/xnio-api/3.8.8.Final/xnio-api-3.8.8.Final.jar
@@ -100,17 +152,18 @@ org/jboss/xnio/xnio-nio/3.8.8.Final/xnio-nio-3.8.8.Final.jar
 org/jspecify/jspecify/0.2.0/jspecify-0.2.0.jar
 org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar
 org/ow2/asm/asm/9.4/asm-9.4.jar
+org/slf4j/jcl-over-slf4j/1.7.36/jcl-over-slf4j-1.7.36.jar
 org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
 org/slf4j/slf4j-nop/2.0.9/slf4j-nop-2.0.9.jar
 org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar
 org/wildfly/common/wildfly-common/1.5.4.Final/wildfly-common-1.5.4.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
+reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
-re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
+refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1.jar
+re-frame/re-frame/1.4.3/re-frame-1.4.3.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
-reagent/reagent/1.2.0/reagent-1.2.0.jar
-refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.2.0/ring-codec-1.2.0.jar
 ring/ring-core/1.9.6/ring-core-1.9.6.jar

nix/deps/gradle/deps.list

@@ -1,7 +1,9 @@
 androidx.activity:activity:1.0.0
 androidx.activity:activity:1.0.0-rc01
 androidx.activity:activity:1.2.4
+androidx.activity:activity:1.6.0
 androidx.annotation:annotation-experimental:1.1.0
+androidx.annotation:annotation-experimental:1.3.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
@@ -9,14 +11,12 @@ androidx.annotation:annotation:1.3.0
 androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
-androidx.appcompat:appcompat-resources:1.4.1
-androidx.appcompat:appcompat-resources:1.4.2
+androidx.appcompat:appcompat-resources:1.6.1
 androidx.appcompat:appcompat:1.0.0
 androidx.appcompat:appcompat:1.1.0-rc01
 androidx.appcompat:appcompat:1.2.0
 androidx.appcompat:appcompat:1.3.1
-androidx.appcompat:appcompat:1.4.1
-androidx.appcompat:appcompat:1.4.2
+androidx.appcompat:appcompat:1.6.1
 androidx.arch.core:core-common:2.0.0
 androidx.arch.core:core-common:2.1.0
 androidx.arch.core:core-common:2.1.0-rc01
@@ -38,34 +38,36 @@ androidx.constraintlayout:constraintlayout-solver:2.0.4
 androidx.constraintlayout:constraintlayout:2.0.4
 androidx.coordinatorlayout:coordinatorlayout:1.0.0
 androidx.coordinatorlayout:coordinatorlayout:1.1.0
+androidx.core:core-ktx:1.2.0
 androidx.core:core-ktx:1.6.0
+androidx.core:core-ktx:1.9.0
 androidx.core:core-splashscreen:1.0.0
 androidx.core:core:1.0.0
 androidx.core:core:1.1.0
 androidx.core:core:1.1.0-rc01
 androidx.core:core:1.2.0
 androidx.core:core:1.6.0
-androidx.core:core:1.7.0
+androidx.core:core:1.9.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
-androidx.databinding:databinding-common:3.5.4
+androidx.databinding:databinding-common:3.5.3
 androidx.databinding:databinding-common:4.1.0
 androidx.databinding:databinding-common:7.0.4
 androidx.databinding:databinding-common:7.2.1
 androidx.databinding:databinding-common:7.3.1
-androidx.databinding:databinding-common:7.4.2
+androidx.databinding:databinding-common:8.1.1
 androidx.databinding:databinding-compiler-common:3.2.1
-androidx.databinding:databinding-compiler-common:3.5.4
+androidx.databinding:databinding-compiler-common:3.5.3
 androidx.databinding:databinding-compiler-common:4.1.0
 androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
 androidx.databinding:databinding-compiler-common:7.3.1
-androidx.databinding:databinding-compiler-common:7.4.2
+androidx.databinding:databinding-compiler-common:8.1.1
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
-androidx.emoji2:emoji2-views-helper:1.0.0
-androidx.emoji2:emoji2:1.0.0
+androidx.emoji2:emoji2-views-helper:1.2.0
+androidx.emoji2:emoji2:1.2.0
 androidx.exifinterface:exifinterface:1.0.0
 androidx.exifinterface:exifinterface:1.1.0-beta01
 androidx.exifinterface:exifinterface:1.1.0-rc01
@@ -83,23 +85,26 @@ androidx.lifecycle:lifecycle-common:2.0.0
 androidx.lifecycle:lifecycle-common:2.1.0
 androidx.lifecycle:lifecycle-common:2.1.0-rc01
 androidx.lifecycle:lifecycle-common:2.3.1
-androidx.lifecycle:lifecycle-common:2.4.0
+androidx.lifecycle:lifecycle-common:2.5.1
 androidx.lifecycle:lifecycle-livedata-core:2.0.0
 androidx.lifecycle:lifecycle-livedata-core:2.1.0
 androidx.lifecycle:lifecycle-livedata-core:2.3.1
+androidx.lifecycle:lifecycle-livedata-core:2.5.1
 androidx.lifecycle:lifecycle-livedata:2.0.0
 androidx.lifecycle:lifecycle-livedata:2.1.0
-androidx.lifecycle:lifecycle-process:2.4.0
+androidx.lifecycle:lifecycle-process:2.4.1
 androidx.lifecycle:lifecycle-runtime:2.0.0
 androidx.lifecycle:lifecycle-runtime:2.1.0
 androidx.lifecycle:lifecycle-runtime:2.1.0-rc01
 androidx.lifecycle:lifecycle-runtime:2.3.1
-androidx.lifecycle:lifecycle-runtime:2.4.0
+androidx.lifecycle:lifecycle-runtime:2.5.1
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1
 androidx.lifecycle:lifecycle-viewmodel:2.0.0
 androidx.lifecycle:lifecycle-viewmodel:2.1.0
 androidx.lifecycle:lifecycle-viewmodel:2.1.0-rc01
 androidx.lifecycle:lifecycle-viewmodel:2.3.1
+androidx.lifecycle:lifecycle-viewmodel:2.5.1
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.media:media:1.0.0
@@ -107,12 +112,13 @@ androidx.multidex:multidex:2.0.1
 androidx.print:print:1.0.0
 androidx.recyclerview:recyclerview:1.0.0
 androidx.recyclerview:recyclerview:1.1.0
-androidx.resourceinspection:resourceinspection-annotation:1.0.0
+androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.savedstate:savedstate:1.0.0
 androidx.savedstate:savedstate:1.0.0-rc01
 androidx.savedstate:savedstate:1.1.0
+androidx.savedstate:savedstate:1.2.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
-androidx.startup:startup-runtime:1.0.0
+androidx.startup:startup-runtime:1.1.1
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02
@@ -154,52 +160,47 @@ com.afollestad.material-dialogs:core:0.9.6.0
 com.airbnb.android:lottie:3.4.4
 com.almworks.sqlite4java:sqlite4java:1.0.392
 com.android.databinding:baseLibrary:1.0-rc5
-com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
 com.android.databinding:baseLibrary:3.2.1
-com.android.databinding:baseLibrary:3.5.4
+com.android.databinding:baseLibrary:3.5.3
 com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
 com.android.databinding:baseLibrary:7.3.1
-com.android.databinding:baseLibrary:7.4.2
+com.android.databinding:baseLibrary:8.1.1
 com.android.databinding:compilerCommon:1.0-rc5
-com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
 com.android.tools.analytics-library:crash:26.2.1
-com.android.tools.analytics-library:crash:26.5.4
+com.android.tools.analytics-library:crash:26.5.3
 com.android.tools.analytics-library:crash:27.1.0
 com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
 com.android.tools.analytics-library:crash:30.3.1
-com.android.tools.analytics-library:crash:30.4.2
-com.android.tools.analytics-library:protos:26.0.0
+com.android.tools.analytics-library:crash:31.1.1
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
-com.android.tools.analytics-library:protos:26.5.4
+com.android.tools.analytics-library:protos:26.5.3
 com.android.tools.analytics-library:protos:27.1.0
 com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
 com.android.tools.analytics-library:protos:30.3.1
-com.android.tools.analytics-library:protos:30.4.2
-com.android.tools.analytics-library:shared:26.0.0
+com.android.tools.analytics-library:protos:31.1.1
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
-com.android.tools.analytics-library:shared:26.5.4
+com.android.tools.analytics-library:shared:26.5.3
 com.android.tools.analytics-library:shared:27.1.0
 com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
 com.android.tools.analytics-library:shared:30.3.1
-com.android.tools.analytics-library:shared:30.4.2
-com.android.tools.analytics-library:tracker:26.0.0
+com.android.tools.analytics-library:shared:31.1.1
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
-com.android.tools.analytics-library:tracker:26.5.4
+com.android.tools.analytics-library:tracker:26.5.3
 com.android.tools.analytics-library:tracker:27.1.0
 com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
 com.android.tools.analytics-library:tracker:30.3.1
-com.android.tools.analytics-library:tracker:30.4.2
+com.android.tools.analytics-library:tracker:31.1.1
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09
@@ -214,282 +215,278 @@ com.android.tools.build:aapt2-proto:4.1.0-6503028
 com.android.tools.build:aapt2-proto:7.0.4-7396180
 com.android.tools.build:aapt2-proto:7.2.1-7984345
 com.android.tools.build:aapt2-proto:7.3.1-8691043
-com.android.tools.build:aapt2-proto:7.4.2-8841542
+com.android.tools.build:aapt2-proto:8.1.1-10154469
+com.android.tools.build:aapt2:8.1.1-10154469
 com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:aaptcompiler:7.0.4
 com.android.tools.build:aaptcompiler:7.2.1
 com.android.tools.build:aaptcompiler:7.3.1
-com.android.tools.build:aaptcompiler:7.4.2
-com.android.tools.build:apksig:3.0.0
+com.android.tools.build:aaptcompiler:8.1.1
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
-com.android.tools.build:apksig:3.5.4
+com.android.tools.build:apksig:3.5.3
 com.android.tools.build:apksig:4.1.0
 com.android.tools.build:apksig:7.0.4
 com.android.tools.build:apksig:7.2.1
 com.android.tools.build:apksig:7.3.1
-com.android.tools.build:apksig:7.4.2
+com.android.tools.build:apksig:8.1.1
 com.android.tools.build:apkzlib:3.2.1
-com.android.tools.build:apkzlib:3.5.4
+com.android.tools.build:apkzlib:3.5.3
 com.android.tools.build:apkzlib:4.1.0
 com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
 com.android.tools.build:apkzlib:7.3.1
-com.android.tools.build:apkzlib:7.4.2
+com.android.tools.build:apkzlib:8.1.1
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
-com.android.tools.build:builder-model:3.0.0
 com.android.tools.build:builder-model:3.0.1
 com.android.tools.build:builder-model:3.2.1
-com.android.tools.build:builder-model:3.5.4
+com.android.tools.build:builder-model:3.5.3
 com.android.tools.build:builder-model:4.1.0
 com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
 com.android.tools.build:builder-model:7.3.1
-com.android.tools.build:builder-model:7.4.2
+com.android.tools.build:builder-model:8.1.1
 com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
-com.android.tools.build:builder-test-api:3.0.0
 com.android.tools.build:builder-test-api:3.0.1
 com.android.tools.build:builder-test-api:3.2.1
-com.android.tools.build:builder-test-api:3.5.4
+com.android.tools.build:builder-test-api:3.5.3
 com.android.tools.build:builder-test-api:4.1.0
 com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
 com.android.tools.build:builder-test-api:7.3.1
-com.android.tools.build:builder-test-api:7.4.2
+com.android.tools.build:builder-test-api:8.1.1
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
-com.android.tools.build:builder:3.0.0
 com.android.tools.build:builder:3.0.1
 com.android.tools.build:builder:3.2.1
-com.android.tools.build:builder:3.5.4
+com.android.tools.build:builder:3.5.3
 com.android.tools.build:builder:4.1.0
 com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
 com.android.tools.build:builder:7.3.1
-com.android.tools.build:builder:7.4.2
+com.android.tools.build:builder:8.1.1
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
 com.android.tools.build:bundletool:1.6.0
 com.android.tools.build:bundletool:1.8.2
 com.android.tools.build:bundletool:1.9.0
-com.android.tools.build:bundletool:1.11.4
-com.android.tools.build:gradle-api:3.0.0
+com.android.tools.build:bundletool:1.14.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
-com.android.tools.build:gradle-api:3.5.4
+com.android.tools.build:gradle-api:3.5.3
 com.android.tools.build:gradle-api:4.1.0
 com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
 com.android.tools.build:gradle-api:7.3.1
-com.android.tools.build:gradle-api:7.4.2
+com.android.tools.build:gradle-api:8.1.1
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
-com.android.tools.build:gradle-core:3.0.0
 com.android.tools.build:gradle-core:3.0.1
-com.android.tools.build:gradle-settings-api:7.4.2
+com.android.tools.build:gradle-settings-api:8.1.1
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
-com.android.tools.build:gradle:3.0.0
 com.android.tools.build:gradle:3.0.1
 com.android.tools.build:gradle:3.2.1
-com.android.tools.build:gradle:3.5.4
+com.android.tools.build:gradle:3.5.3
 com.android.tools.build:gradle:4.1.0
 com.android.tools.build:gradle:7.0.4
 com.android.tools.build:gradle:7.2.1
 com.android.tools.build:gradle:7.3.1
 com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
-com.android.tools.build:manifest-merger:26.0.0
 com.android.tools.build:manifest-merger:26.0.1
 com.android.tools.build:manifest-merger:26.2.1
-com.android.tools.build:manifest-merger:26.5.4
+com.android.tools.build:manifest-merger:26.5.3
 com.android.tools.build:manifest-merger:27.1.0
 com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
 com.android.tools.build:manifest-merger:30.3.1
-com.android.tools.build:manifest-merger:30.4.2
+com.android.tools.build:manifest-merger:31.1.1
 com.android.tools.build:transform-api:1.5.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
 com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
-com.android.tools.ddms:ddmlib:26.0.0
 com.android.tools.ddms:ddmlib:26.0.1
 com.android.tools.ddms:ddmlib:26.2.1
-com.android.tools.ddms:ddmlib:26.5.4
+com.android.tools.ddms:ddmlib:26.5.3
 com.android.tools.ddms:ddmlib:27.1.0
 com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
 com.android.tools.ddms:ddmlib:30.3.1
-com.android.tools.ddms:ddmlib:30.4.2
-com.android.tools.external.com-intellij:intellij-core:26.0.0
+com.android.tools.ddms:ddmlib:31.1.1
 com.android.tools.external.com-intellij:intellij-core:26.0.1
 com.android.tools.external.lombok:lombok-ast:0.2.3
-com.android.tools.external.org-jetbrains:uast:26.0.0
 com.android.tools.external.org-jetbrains:uast:26.0.1
 com.android.tools.jack:jack-api:0.9.0
 com.android.tools.jill:jill-api:0.9.0
 com.android.tools.layoutlib:layoutlib-api:24.3.1
 com.android.tools.layoutlib:layoutlib-api:24.5.0
-com.android.tools.layoutlib:layoutlib-api:26.0.0
 com.android.tools.layoutlib:layoutlib-api:26.0.1
 com.android.tools.layoutlib:layoutlib-api:26.2.1
-com.android.tools.layoutlib:layoutlib-api:26.5.4
+com.android.tools.layoutlib:layoutlib-api:26.5.3
 com.android.tools.layoutlib:layoutlib-api:27.1.0
 com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
 com.android.tools.layoutlib:layoutlib-api:30.3.1
-com.android.tools.layoutlib:layoutlib-api:30.4.2
+com.android.tools.layoutlib:layoutlib-api:31.1.1
 com.android.tools.lint:lint-api:24.3.1
 com.android.tools.lint:lint-api:24.5.0
-com.android.tools.lint:lint-api:26.0.0
 com.android.tools.lint:lint-api:26.0.1
 com.android.tools.lint:lint-checks:24.3.1
 com.android.tools.lint:lint-checks:24.5.0
-com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-gradle-api:26.2.1
-com.android.tools.lint:lint-gradle-api:26.5.4
+com.android.tools.lint:lint-gradle-api:26.5.3
 com.android.tools.lint:lint-gradle-api:27.1.0
 com.android.tools.lint:lint-model:27.1.0
 com.android.tools.lint:lint-model:30.0.4
 com.android.tools.lint:lint-model:30.2.1
 com.android.tools.lint:lint-model:30.3.1
-com.android.tools.lint:lint-model:30.4.2
+com.android.tools.lint:lint-model:31.1.1
 com.android.tools.lint:lint-typedef-remover:30.2.1
 com.android.tools.lint:lint-typedef-remover:30.3.1
-com.android.tools.lint:lint-typedef-remover:30.4.2
+com.android.tools.lint:lint-typedef-remover:31.1.1
 com.android.tools.lint:lint:24.3.1
 com.android.tools.lint:lint:24.5.0
-com.android.tools.lint:lint:26.0.0
 com.android.tools.lint:lint:26.0.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.1
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2
+com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.0.4
 com.android.tools.utp:android-device-provider-gradle-proto:30.2.1
 com.android.tools.utp:android-device-provider-gradle-proto:30.3.1
-com.android.tools.utp:android-device-provider-gradle-proto:30.4.2
+com.android.tools.utp:android-device-provider-gradle-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2
+com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.1
+com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.4
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2
+com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.4
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.1
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.1
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
-com.android.tools:annotations:26.0.0
 com.android.tools:annotations:26.0.1
 com.android.tools:annotations:26.2.1
-com.android.tools:annotations:26.5.4
+com.android.tools:annotations:26.5.3
 com.android.tools:annotations:27.1.0
 com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
 com.android.tools:annotations:30.3.1
-com.android.tools:annotations:30.4.2
+com.android.tools:annotations:31.1.1
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
-com.android.tools:common:26.0.0
 com.android.tools:common:26.0.1
 com.android.tools:common:26.2.1
-com.android.tools:common:26.5.4
+com.android.tools:common:26.5.3
 com.android.tools:common:27.1.0
 com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
 com.android.tools:common:30.3.1
-com.android.tools:common:30.4.2
+com.android.tools:common:31.1.1
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
-com.android.tools:dvlib:26.0.0
 com.android.tools:dvlib:26.0.1
 com.android.tools:dvlib:26.2.1
-com.android.tools:dvlib:26.5.4
+com.android.tools:dvlib:26.5.3
 com.android.tools:dvlib:27.1.0
 com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
 com.android.tools:dvlib:30.3.1
-com.android.tools:dvlib:30.4.2
-com.android.tools:repository:26.0.0
+com.android.tools:dvlib:31.1.1
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
-com.android.tools:repository:26.5.4
+com.android.tools:repository:26.5.3
 com.android.tools:repository:27.1.0
 com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
 com.android.tools:repository:30.3.1
-com.android.tools:repository:30.4.2
+com.android.tools:repository:31.1.1
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
-com.android.tools:sdklib:26.0.0
 com.android.tools:sdklib:26.0.1
 com.android.tools:sdklib:26.2.1
-com.android.tools:sdklib:26.5.4
+com.android.tools:sdklib:26.5.3
 com.android.tools:sdklib:27.1.0
 com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
 com.android.tools:sdklib:30.3.1
-com.android.tools:sdklib:30.4.2
+com.android.tools:sdklib:31.1.1
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
-com.android.tools:sdk-common:26.0.0
 com.android.tools:sdk-common:26.0.1
 com.android.tools:sdk-common:26.2.1
-com.android.tools:sdk-common:26.5.4
+com.android.tools:sdk-common:26.5.3
 com.android.tools:sdk-common:27.1.0
 com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
 com.android.tools:sdk-common:30.3.1
-com.android.tools:sdk-common:30.4.2
+com.android.tools:sdk-common:31.1.1
 com.android:signflinger:4.1.0
 com.android:signflinger:7.0.4
 com.android:signflinger:7.2.1
 com.android:signflinger:7.3.1
-com.android:signflinger:7.4.2
+com.android:signflinger:8.1.1
 com.android:zipflinger:4.1.0
 com.android:zipflinger:7.0.4
 com.android:zipflinger:7.2.1
 com.android:zipflinger:7.3.1
-com.android:zipflinger:7.4.2
+com.android:zipflinger:8.1.1
 com.diffplug.durian:durian-collect:1.2.0
 com.diffplug.durian:durian-core:1.2.0
 com.diffplug.durian:durian-io:1.2.0
+com.diffplug.spotless:spotless-lib-extra:2.26.2
 com.diffplug.spotless:spotless-lib-extra:2.30.0
+com.diffplug.spotless:spotless-lib:2.26.2
 com.diffplug.spotless:spotless-lib:2.30.0
+com.diffplug.spotless:spotless-plugin-gradle:6.7.2
 com.diffplug.spotless:spotless-plugin-gradle:6.11.0
 com.drewnoakes:metadata-extractor:2.18.0
 com.facebook.conceal:conceal:1.1.3
-com.facebook.fbjni:fbjni:0.3.0
+com.facebook.fbjni:fbjni:0.5.1
 com.facebook.fresco:animated-base:2.5.0
 com.facebook.fresco:animated-drawable:2.5.0
 com.facebook.fresco:animated-gif:2.5.0
 com.facebook.fresco:drawee:2.5.0
+com.facebook.fresco:drawee:3.1.3
 com.facebook.fresco:fbcore:2.5.0
+com.facebook.fresco:fbcore:3.1.3
 com.facebook.fresco:fresco:2.5.0
+com.facebook.fresco:fresco:3.1.3
 com.facebook.fresco:imagepipeline-base:2.5.0
+com.facebook.fresco:imagepipeline-base:3.1.3
 com.facebook.fresco:imagepipeline-native:2.5.0
-com.facebook.fresco:imagepipeline-okhttp3:2.5.0
+com.facebook.fresco:imagepipeline-native:3.1.3
+com.facebook.fresco:imagepipeline-okhttp3:3.1.3
 com.facebook.fresco:imagepipeline:2.5.0
+com.facebook.fresco:imagepipeline:3.1.3
 com.facebook.fresco:memory-type-ashmem:2.5.0
+com.facebook.fresco:memory-type-ashmem:3.1.3
 com.facebook.fresco:memory-type-java:2.5.0
+com.facebook.fresco:memory-type-java:3.1.3
 com.facebook.fresco:memory-type-native:2.5.0
-com.facebook.fresco:middleware:2.5.0
+com.facebook.fresco:memory-type-native:3.1.3
+com.facebook.fresco:middleware:3.1.3
 com.facebook.fresco:nativeimagefilters:2.5.0
+com.facebook.fresco:nativeimagefilters:3.1.3
 com.facebook.fresco:nativeimagetranscoder:2.5.0
-com.facebook.fresco:soloader:2.5.0
-com.facebook.fresco:ui-common:2.5.0
+com.facebook.fresco:nativeimagetranscoder:3.1.3
+com.facebook.fresco:soloader:3.1.3
+com.facebook.fresco:ui-common:3.1.3
 com.facebook.infer.annotation:infer-annotation:0.18.0
-com.facebook.react:hermes-android:0.72.5
-com.facebook.react:react-android:0.72.5
+com.facebook.react:react-android:0.73.5
 com.facebook.soloader:annotation:0.10.5
 com.facebook.soloader:nativeloader:0.10.5
 com.facebook.soloader:soloader:0.10.5
@@ -517,6 +514,7 @@ com.github.wix-playground:ahbottomnavigation:3.3.0
 com.github.wix-playground:reflow-animator:1.0.6
 com.github.yalantis:ucrop:2.2.6-native
 com.googlecode.concurrent-trees:concurrent-trees:2.6.1
+com.googlecode.javaewah:JavaEWAH:1.1.12
 com.googlecode.javaewah:JavaEWAH:1.1.13
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
@@ -545,6 +543,7 @@ com.google.code.gson:gson:2.8.5
 com.google.code.gson:gson:2.8.6
 com.google.code.gson:gson:2.8.9
 com.google.crypto.tink:tink:1.3.0-rc2
+com.google.crypto.tink:tink:1.7.0
 com.google.dagger:dagger:2.28.3
 com.google.errorprone:error_prone_annotations:2.0.18
 com.google.errorprone:error_prone_annotations:2.2.0
@@ -552,8 +551,8 @@ com.google.errorprone:error_prone_annotations:2.3.1
 com.google.errorprone:error_prone_annotations:2.3.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_annotations:2.4.0
-com.google.errorprone:error_prone_annotations:2.7.1
 com.google.errorprone:error_prone_annotations:2.9.0
+com.google.errorprone:error_prone_annotations:2.11.0
 com.google.firebase:firebase-annotations:16.0.0
 com.google.firebase:firebase-components:16.1.0
 com.google.firebase:firebase-encoders-json:17.1.0
@@ -567,7 +566,7 @@ com.google.guava:guava:27.0.1-jre
 com.google.guava:guava:28.1-jre
 com.google.guava:guava:29.0-jre
 com.google.guava:guava:30.1-jre
-com.google.guava:guava:31.0.1-jre
+com.google.guava:guava:31.1-jre
 com.google.guava:listenablefuture:1.0
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
@@ -582,10 +581,12 @@ com.google.prefab:cli:2.0.0
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java-util:3.10.0
 com.google.protobuf:protobuf-java-util:3.17.2
+com.google.protobuf:protobuf-java-util:3.19.3
 com.google.protobuf:protobuf-java:3.0.0
 com.google.protobuf:protobuf-java:3.4.0
 com.google.protobuf:protobuf-java:3.10.0
 com.google.protobuf:protobuf-java:3.17.2
+com.google.protobuf:protobuf-java:3.19.3
 com.google.testing.platform:core-proto:0.0.8-alpha04
 com.google.testing.platform:core-proto:0.0.8-alpha07
 com.google.testing.platform:core-proto:0.0.8-alpha08
@@ -593,12 +594,13 @@ com.google.test.platform:core-proto:0.0.2-dev
 com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
 com.parse.bolts:bolts-tasks:1.4.0
-com.squareup.okhttp3:okhttp-tls:4.9.2
+com.squareup.okhttp3:okhttp-tls:4.11.0
 com.squareup.okhttp3:okhttp-urlconnection:4.9.2
 com.squareup.okhttp3:okhttp:4.9.2
-com.squareup.okio:okio-metadata:2.8.0
-com.squareup.okio:okio:2.8.0
+com.squareup.okhttp3:okhttp:4.11.0
+com.squareup.okio:okio-jvm:3.2.0
 com.squareup.okio:okio:2.9.0
+com.squareup.okio:okio:3.2.0
 com.squareup:javapoet:1.8.0
 com.squareup:javapoet:1.10.0
 com.squareup:javapoet:1.13.0
@@ -617,38 +619,56 @@ de.undercouch:gradle-download-task:4.1.1
 de.undercouch:gradle-download-task:5.0.1
 io.grpc:grpc-api:1.21.1
 io.grpc:grpc-api:1.39.0
+io.grpc:grpc-api:1.45.1
 io.grpc:grpc-context:1.21.1
 io.grpc:grpc-context:1.39.0
+io.grpc:grpc-context:1.45.1
 io.grpc:grpc-core:1.21.1
 io.grpc:grpc-core:1.39.0
+io.grpc:grpc-core:1.45.1
 io.grpc:grpc-netty:1.21.1
 io.grpc:grpc-netty:1.39.0
+io.grpc:grpc-netty:1.45.1
 io.grpc:grpc-protobuf-lite:1.21.1
 io.grpc:grpc-protobuf-lite:1.39.0
+io.grpc:grpc-protobuf-lite:1.45.1
 io.grpc:grpc-protobuf:1.21.1
 io.grpc:grpc-protobuf:1.39.0
+io.grpc:grpc-protobuf:1.45.1
 io.grpc:grpc-stub:1.21.1
 io.grpc:grpc-stub:1.39.0
+io.grpc:grpc-stub:1.45.1
 io.netty:netty-buffer:4.1.34.Final
 io.netty:netty-buffer:4.1.52.Final
+io.netty:netty-buffer:4.1.72.Final
 io.netty:netty-codec-http2:4.1.34.Final
 io.netty:netty-codec-http2:4.1.52.Final
+io.netty:netty-codec-http2:4.1.72.Final
 io.netty:netty-codec-http:4.1.34.Final
 io.netty:netty-codec-http:4.1.52.Final
+io.netty:netty-codec-http:4.1.72.Final
 io.netty:netty-codec-socks:4.1.34.Final
 io.netty:netty-codec-socks:4.1.52.Final
+io.netty:netty-codec-socks:4.1.72.Final
 io.netty:netty-codec:4.1.34.Final
 io.netty:netty-codec:4.1.52.Final
+io.netty:netty-codec:4.1.72.Final
 io.netty:netty-common:4.1.34.Final
 io.netty:netty-common:4.1.52.Final
+io.netty:netty-common:4.1.72.Final
 io.netty:netty-handler-proxy:4.1.34.Final
 io.netty:netty-handler-proxy:4.1.52.Final
+io.netty:netty-handler-proxy:4.1.72.Final
 io.netty:netty-handler:4.1.34.Final
 io.netty:netty-handler:4.1.52.Final
+io.netty:netty-handler:4.1.72.Final
 io.netty:netty-resolver:4.1.34.Final
 io.netty:netty-resolver:4.1.52.Final
+io.netty:netty-resolver:4.1.72.Final
+io.netty:netty-tcnative-classes:2.0.46.Final
 io.netty:netty-transport:4.1.34.Final
 io.netty:netty-transport:4.1.52.Final
+io.netty:netty-transport:4.1.72.Final
 io.opencensus:opencensus-api:0.21.0
 io.opencensus:opencensus-contrib-grpc-metrics:0.21.0
 io.perfmark:perfmark-api:0.23.0
@@ -686,6 +706,7 @@ org.antlr:antlr:3.5.2
 org.apache.commons:commons-compress:1.8.1
 org.apache.commons:commons-compress:1.12
 org.apache.commons:commons-compress:1.20
+org.apache.commons:commons-compress:1.21
 org.apache.commons:commons-lang3:3.3.2
 org.apache.commons:commons-lang3:3.9
 org.apache.httpcomponents:httpclient:4.1.1
@@ -700,6 +721,7 @@ org.apache.httpcomponents:httpcore:4.4.5
 org.apache.httpcomponents:httpcore:4.4.10
 org.apache.httpcomponents:httpcore:4.4.11
 org.apache.httpcomponents:httpcore:4.4.13
+org.apache.httpcomponents:httpcore:4.4.15
 org.apache.httpcomponents:httpmime:4.1
 org.apache.httpcomponents:httpmime:4.5.2
 org.apache.httpcomponents:httpmime:4.5.6
@@ -717,16 +739,18 @@ org.checkerframework:checker-qual:2.8.1
 org.checkerframework:checker-qual:2.11.1
 org.checkerframework:checker-qual:3.5.0
 org.checkerframework:checker-qual:3.12.0
+org.codehaus.groovy:groovy-xml:3.0.9
 org.codehaus.groovy:groovy-xml:3.0.10
+org.codehaus.groovy:groovy:3.0.9
 org.codehaus.groovy:groovy:3.0.10
 org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.codehaus.mojo:animal-sniffer-annotations:1.17
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.codehaus.mojo:animal-sniffer-annotations:1.19
 org.codehaus.woodstox:stax2-api:4.2.1
-org.conscrypt:conscrypt-android:2.0.0
 org.eclipse.jdt.core.compiler:ecj:4.4.2
 org.eclipse.jdt.core.compiler:ecj:4.6.1
+org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r
 org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r
 org.fusesource.jansi:jansi:1.18
 org.glassfish.jaxb:jaxb-core:2.2.11
@@ -738,23 +762,21 @@ org.glassfish.jaxb:txw2:2.3.1
 org.glassfish.jaxb:txw2:2.3.2
 org.hamcrest:hamcrest-core:1.3
 org.hamcrest:hamcrest:2.2
-org.jacoco:org.jacoco.agent:0.8.8
-org.jacoco:org.jacoco.ant:0.8.8
 org.jacoco:org.jacoco.core:0.7.4.201502262128
-org.jacoco:org.jacoco.core:0.8.8
 org.jacoco:org.jacoco.report:0.7.4.201502262128
-org.jacoco:org.jacoco.report:0.8.8
 org.jdom:jdom2:2.0.6
 org.jetbrains.dokka:dokka-core:1.4.32
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
 org.jetbrains.kotlinx:atomicfu:0.16.3
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
 org.jetbrains.kotlin:kotlin-android-extensions:1.9.0
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
@@ -794,7 +816,7 @@ org.jetbrains.kotlin:kotlin-reflect:1.3.72
 org.jetbrains.kotlin:kotlin-reflect:1.4.32
 org.jetbrains.kotlin:kotlin-reflect:1.5.31
 org.jetbrains.kotlin:kotlin-reflect:1.6.10
-org.jetbrains.kotlin:kotlin-reflect:1.7.10
+org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2
 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
 org.jetbrains.kotlin:kotlin-scripting-common:1.9.0
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
@@ -810,7 +832,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
@@ -818,14 +841,16 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
@@ -834,7 +859,8 @@ org.jetbrains.kotlin:kotlin-stdlib:1.3.72
 org.jetbrains.kotlin:kotlin-stdlib:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
 org.jetbrains.kotlin:kotlin-stdlib:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2
+org.jetbrains.kotlin:kotlin-stdlib:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib:1.9.0
 org.jetbrains.kotlin:kotlin-tooling-core:1.9.0
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
@@ -906,8 +932,15 @@ com.squareup.okio:okio:1.13.0
 com.squareup.okio:okio:1.15.0
 com.squareup.okhttp3:okhttp:3.12.1
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
-com.android.tools.lint:lint-gradle:30.4.2
-com.android.tools.build:gradle:7.4.2
-com.android.tools.build:aapt2:7.4.2-8841542
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
+org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
+com.android.tools.build:gradle:8.1.1
+com.google.errorprone:error_prone_annotations:2.7.1
+com.android.tools.lint:lint-gradle:31.1.1
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
+com.android.tools.build:gradle:3.5.4
+androidx.annotation:annotation:1.6.0
+androidx.annotation:annotation-jvm:1.6.0
+com.facebook.react:hermes-android:0.73.5

nix/deps/gradle/generate.sh

@@ -47,11 +47,18 @@ com.squareup.okio:okio:1.13.0
 com.squareup.okio:okio:1.15.0
 com.squareup.okhttp3:okhttp:3.12.1
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
-com.android.tools.lint:lint-gradle:30.4.2
-com.android.tools.build:gradle:7.4.2
-com.android.tools.build:aapt2:7.4.2-8841542
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0' \
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.9.0
+org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:0.5.0
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.8.0
+com.android.tools.build:gradle:8.1.1
+com.google.errorprone:error_prone_annotations:2.7.1
+com.android.tools.lint:lint-gradle:31.1.1
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
+com.android.tools.build:gradle:3.5.4
+androidx.annotation:annotation:1.6.0
+androidx.annotation:annotation-jvm:1.6.0
+com.facebook.react:hermes-android:0.73.5' \
         >> "${DEPS_LIST}"
 }
 

nix/deps/gradle/proj.list

@@ -6,8 +6,8 @@ react-native-blob-util
 react-native-blur
 react-native-camera-kit
 react-native-camera-roll_camera-roll
+react-native-clipboard_clipboard
 react-native-community_audio-toolkit
-react-native-community_clipboard
 react-native-community_masked-view
 react-native-community_netinfo
 react-native-community_slider
@@ -16,20 +16,17 @@ react-native-dialogs
 react-native-fast-image
 react-native-fs
 react-native-gesture-handler
-react-native-haptic-feedback
+react-native-get-random-values
 react-native-hole-view
 react-native-image-crop-picker
 react-native-image-resizer
 react-native-keychain
-react-native-languages
 react-native-linear-gradient
 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
 react-native-shake
 react-native-share
@@ -37,5 +34,5 @@ react-native-static-safe-area-insets
 react-native-status
 react-native-status-keycard
 react-native-svg
-react-native-transparent-video
 react-native-webview
+walletconnect_react-native-compat

nix/deps/nodejs-patched/default.nix

@@ -4,15 +4,16 @@
 
 { stdenv, deps, nodejs, patchMavenSources }:
 
+let
+  patchesDir = ./../../../patches;
+  patches = builtins.attrNames (builtins.readDir patchesDir);
+in
 stdenv.mkDerivation {
   name = "${deps.nodejs.name}-patched";
   phases = [
     "unpackPhase"
     "patchGradlePhase"
-    "patchBuildIdPhase"
-    "patchKeyChainPhase"
-    "patchGlogPhase"
-    "patchBoostPodSpec"
+    "patchNodeLibsPhase"
     "installPhase"
   ];
 
@@ -49,41 +50,15 @@ stdenv.mkDerivation {
     done
   '';
 
-  # Do not add a BuildId to the generated libraries, for reproducibility
-  patchBuildIdPhase = ''
-    substituteInPlace ./node_modules/react-native/ReactAndroid/src/main/jni/CMakeLists.txt --replace \
-      '-Wl,--build-id' \
-      '-Wl,--build-id=none'
-  '';
-
   installPhase = ''
     mkdir -p $out
     cp -R node_modules $out/
   '';
 
-  # Remove gradle-test-logger-plugin:
-  # https://github.com/oblador/react-native-keychain/issues/595
-  # TODO: remove this patch when we this library fixes above issue
-  patchKeyChainPhase = ''
-    sed -i -e '/classpath/d' \
-      -e '/apply plugin: "com\.adarshr\.test-logger"/d' \
-      ./node_modules/react-native-keychain/android/build.gradle
-  '';
-
-  # Fix pod issue after upgrading to MacOS Sonoma and Xcode 15
-  # https://github.com/status-im/status-mobile/issues/17682
-  patchGlogPhase = ''
-    substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh \
-    --replace 'export CC="' '#export CC="' \
-    --replace 'export CXX="' '#export CXX="'
-  '';
-
-  # to fix pod checksum issue : https://github.com/facebook/react-native/issues/42180
-  # TODO remove this patch after upgrading to react-native 0.73.2
-  patchBoostPodSpec = ''
-   substituteInPlace ./node_modules/react-native/third-party-podspecs/boost.podspec \
-      --replace 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2' \
-      'https://sourceforge.net/projects/boost/files/boost/1.76.0/boost_1_76_0.tar.bz2' \
+  patchNodeLibsPhase = ''
+    for patch in ${toString patches}; do
+      patch -p1 < ${patchesDir}/$patch
+    done
   '';
 
   # The ELF types are incompatible with the host platform, so let's not even try

nix/deps/nodejs/README.md

@@ -27,7 +27,6 @@ deps  node_modules
  > ls node_modules | grep react-native-image
 react-native-image-crop-picker
 react-native-image-resizer
-react-native-image-viewing
 ```
 
 # Known Issues

nix/mobile/android/build.nix

@@ -26,9 +26,10 @@
 
 let
   inherit (lib) toLower optionalString stringLength makeLibraryPath elem;
+  notDebug = (buildType != "debug");
 
   # Pass secretsFile for POKT_TOKEN to jsbundle build
-  builtJsBundle = jsbundle { inherit secretsFile; };
+  builtJsBundle = lib.optionals notDebug jsbundle { inherit secretsFile; };
 
   # Map ANDROID_ABI_INCLUDE to status-go targets
   androidAbiIncludeSplit = lib.splitString ";" androidAbiInclude;
@@ -119,8 +120,10 @@ in stdenv.mkDerivation rec {
     # Export all vars from .env file
     export $(cut -d= -f1 .env)
 
+    ${lib.optionalString notDebug ''
     # Symlink React Native entrypoint.
     cp -Lr ${builtJsBundle} ./result
+    ''}
 
     # Copy android/ directory
     mkdir -p ./android/build
@@ -153,6 +156,7 @@ in stdenv.mkDerivation rec {
       --no-scan \
       --no-watch-fs \
       --no-build-cache \
+      --parallel \
       -Dmaven.repo.local='${deps.gradle}' \
       assemble${gradleBuildType}
     '';

nix/mobile/fastlane/default.nix

@@ -1,5 +1,5 @@
 { lib, stdenv, callPackage, mkShell,
-  bundlerEnv, cocoapods, bundler, ruby, curl }:
+  bundlerEnv, cocoapods, bundler, ruby, curl, clang }:
 
 let
   inherit (lib) optionals optionalString unique;
@@ -14,7 +14,7 @@ let
 
   inherit (fastlane) shellHook;
 
-  buildInputs = [ ruby bundler fastlane curl ]
+  buildInputs = [ ruby bundler fastlane curl clang ]
     ++ optionals stdenv.isDarwin [ cocoapods ];
 in {
   # HELPERS

nix/mobile/ios/shells/cocoapods.nix

@@ -7,6 +7,8 @@ let
   manifestLock = "ios/Pods/Manifest.lock";
 in mkShell {
   buildInputs = [ cocoapods ];
+  # https://github.com/reactwg/react-native-new-architecture/blob/main/docs/enable-apps.md#enable-new-architecture-for-ios
+  RCT_NEW_ARCH_ENABLED = 1;
   shellHook = ''
     pushd "$STATUS_MOBILE_HOME" > /dev/null
     {

nix/overlay.nix

@@ -56,26 +56,31 @@ in {
   ruby = super.ruby_3_1;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
   openjdk = super.openjdk11_headless;
-  xcodeWrapper = super.xcodeenv.composeXcodeWrapper {
-    version = "15.0";
-    allowHigher = true;
+  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
+    versions = ["15.1" "15.2" "15.3" "15.4"];
   };
-  go = super.go_1_19;
+  go = super.go_1_21;
   clang = super.clang_15;
-  buildGoPackage = super.buildGo119Package;
-  buildGoModule = super.buildGo119Module;
+  buildGoPackage = super.buildGo121Package;
+  buildGoModule = super.buildGo121Module;
   gomobile = (super.gomobile.overrideAttrs (old: {
-    patches = self.fetchurl { # https://github.com/golang/mobile/pull/84
-      url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
-      sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
-    };
+    patches = [
+      (self.fetchurl { # https://github.com/golang/mobile/pull/84
+        url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
+        sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
+      })
+      (self.fetchurl { # https://github.com/golang/go/issues/58426
+        url = "https://github.com/golang/mobile/commit/406ed3a7b8e44dc32844953647b49696d8847d51.patch";
+        sha256 = "sha256-dqbYukHkQEw8npOkKykOAzMC3ot/Y4DEuh7fE+ptlr8=";
+      })
+    ];
   })).override {
     # FIXME: No Android SDK packages for aarch64-darwin.
     withAndroidPkgs = stdenv.system != "aarch64-darwin";
     androidPkgs = self.androidEnvCustom.compose;
   };
 
-  # Android environement
+  # Android environment
   androidEnvCustom = callPackage ./pkgs/android-sdk { };
   androidPkgs = self.androidEnvCustom.pkgs;
   androidShell = self.androidEnvCustom.shell;
@@ -84,6 +89,4 @@ in {
   aapt2 = callPackage ./pkgs/aapt2 { };
   patchMavenSources = callPackage ./pkgs/patch-maven-srcs { };
   goMavenResolver = callPackage ./pkgs/go-maven-resolver { };
-  xcbeautify = callPackage ./pkgs/xcbeautify { };
-  idb-companion = callPackage ./pkgs/idb-companion { };
 }

nix/pkgs.nix

@@ -6,10 +6,11 @@ let
   # For testing local version of nixpkgs
   #nixpkgsSrc = (import <nixpkgs> { }).lib.cleanSource "/home/jakubgs/work/nixpkgs";
 
-  # We follow the master branch of official nixpkgs.
+  # We follow release 23-11 of nixpkgs
+  # https://github.com/NixOS/nixpkgs/releases/tag/23.11
   nixpkgsSrc = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/e7603eba51f2c7820c0a182c6bbb351181caa8e7.tar.gz";
-    sha256 = "sha256:0mwck8jyr74wh1b7g6nac1mxy6a0rkppz8n12andsffybsipz5jw";
+    url = "https://github.com/NixOS/nixpkgs/archive/224fd9a362487ab2894dac0df161c84ab1d8880b.tar.gz";
+    sha256 = "sha256:1syvl39pi1h8lf5gkd9h7ksn5hp34cj7pa3abr59217kv0bdklhy";
   };
 
   # Status specific configuration defaults

nix/pkgs/aapt2/default.nix

@@ -10,7 +10,7 @@ let
 
   pname = "aapt2";
   # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  version = "7.4.2-8841542";
+  version = "8.1.1-10154469";
 
   pkgPath = "com/android/tools/build/aapt2";
   repoUrl = "https://dl.google.com/dl/android/maven2";
@@ -29,20 +29,20 @@ let
     jar = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}";
       sha256 = getAttr platform {
-        linux = "sha256-bHKE8i7QbE0UFgn1TW4gzPj7MBV7t/PVo+Txd6jW0wE=";
-        osx = "sha256-Gmm9dnu2+OccqfqsUiKeanc4FNNkk7lCO0YAoxACjl0=";
+        linux = "sha256-p54GGvEfAo0yk8euVO7QTu/c3zuityZhyGdhFSV6w+E=";
+        osx = "sha256-bO4ljdUEfbuns7EyT1FKGLqNGz+0bms5XsplXvzD2T0=";
       };
     };
     sha = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}.sha1";
       sha256 = getAttr platform {
-        linux = "sha256-mSbHKU3snj5NTg3MN37pmVnVnYRKI9yoMVNJGuUXTso=";
-        osx = "sha256-V/t81ELdzRFoMPSD8wSgbtdQgmUkkOdqRu2iqKIeNVg=";
+        linux = "sha256-oUJOQ9j/sJ7Yt0V9WOrRmuqYI+2UWZxeefJ/WyNoWgw=";
+        osx = "sha256-w+q2j4MKtIOihPMaJxuIP9IwXvRIyBxgRIJLox4E7ac=";
       };
     };
     pom = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.pom}";
-      sha256 = "sha256-9gY2kGJqgVcd1T3UOzYM+xoPug/eGBRUF+cA6Fu9ZRw=";
+      sha256 = "sha256-UdUGCoMmEfJxBS2demYKGdG4lzd2DqQbDUCHt/h7Ohg=";
     };
   };
 

nix/pkgs/android-sdk/compose.nix

@@ -14,8 +14,9 @@ androidenv.composeAndroidPackages {
   cmdLineToolsVersion = "9.0";
   toolsVersion = "26.1.1";
   platformToolsVersion = "33.0.3";
-  buildToolsVersions = [ "33.0.0" ];
-  platformVersions = [ "33" ];
+  buildToolsVersions = [ "34.0.0" ];
+  platformVersions = [ "34" ];
+  # This version must match cmake version inside android/app/build.gradle
   cmakeVersions = [ "3.22.1" ];
   ndkVersion = "25.2.9519653";
   includeNDK = true;

nix/pkgs/idb-companion/default.nix

@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  pname = "idb-companion";
-  version = "1.1.8";
-
-  src = fetchurl {
-    url = "https://github.com/facebook/idb/releases/download/v${version}/idb-companion.universal.tar.gz";
-    sha256 = "sha256-O3LMappbGiKhiCBahAkNOilDR6hGGA79dVzxo8hI4+c=";
-  };
-
-  buildInputs = [ ];
-
-  unpackPhase = ''
-    tar -xzf $src
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp -r ./* $out/bin/
-  '';
-
-  meta = with lib; {
-    description = "A powerful command line tool for automating iOS simulators and devices";
-    homepage = "https://github.com/facebook/idb";
-    license = licenses.mit;
-    platforms = platforms.darwin;
-  };
-}