chore_: upgrade status-go

.clj-kondo/config.edn

@@ -10,8 +10,6 @@
                 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}
@@ -74,8 +72,7 @@
                 ;; https://github.com/borkdude/clj-kondo/issues/867
                 :unresolved-symbol             {:exclude [PersistentPriorityMap.EMPTY
                                                           number
-                                                          legacy.status-im.test-helpers/restore-app-db
-                                                          (cljs.test/is [match-strict?])]}
+                                                          legacy.status-im.test-helpers/restore-app-db]}
                 :unresolved-var                {:level :error}
                 :unsorted-required-namespaces  {:level :error}
                 :unused-alias                  {:level :warning}

.env

@@ -4,6 +4,7 @@ DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -25,6 +26,7 @@ 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
@@ -35,4 +37,3 @@ FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=0
 ENABLE_ALERT_BANNER=0
-FLAG_WALLET_CONNECT_ENABLED=1

.env.e2e

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.staging
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
@@ -38,5 +38,3 @@ SHOW_NOT_IMPLEMENTED_FEATURES=1
 DELETE_MESSAGE_FOR_ME_UNDO_TIME_LIMIT=10000
 DELETE_MESSAGE_UNDO_TIME_LIMIT=10000
 ENABLE_ALERT_BANNER=0
-FLAG_WALLET_CONNECT_ENABLED=1
-MOBILE_DATA_SYNCING_TOGGLE_ENABLE=0

.env.jenkins

@@ -3,6 +3,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -36,4 +37,3 @@ LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
-FLAG_WALLET_CONNECT_ENABLED=1

.env.nightly

@@ -2,6 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -23,4 +24,3 @@ DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
 ENABLE_ALERT_BANNER=1
-FLAG_WALLET_CONNECT_ENABLED=1

.env.release

@@ -2,6 +2,7 @@ DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -17,6 +18,6 @@ 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
-FLAG_WALLET_CONNECT_ENABLED=1

.github/ISSUE_TEMPLATE/bug-report.md

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

.github/PULL_REQUEST_TEMPLATE.md

@@ -70,19 +70,3 @@ 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.
-
-
--->

.prettierignore

@@ -1,15 +1,10 @@
-/*
-
-# Format top-level js files.
+*
 !*.js
-
-# Ignore all except src/js/**/*.js
-!/src/
-/src/*
-!/src/js
-!/src/js/**/*.js
-
-# Ignore all except translations/en.json
-!/translations/
-/translations/*
-!/translations/en.json
+!*/
+*.clj-kondo
+*.shadow-cljs
+modules
+result
+target
+component-spec
+/app

.prettierrc.js

@@ -6,8 +6,4 @@ module.exports = {
   tabWidth: 2,
   trailingComma: 'all',
   useTabs: false,
-
-  // JSON sorting
-  jsonSortOrder: '{ "/.*/": "caseInsensitiveLexical" } ',
-  plugins: ['prettier-plugin-sort-json'],
 };

.zprintrc

@@ -41,7 +41,6 @@
   "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 easily.
+# We don't want to use /run/user/$UID because it runs out of space too easilly.
 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
@@ -215,13 +215,15 @@ build-fdroid: ##@build Build release for F-Droid
 build-android: export BUILD_ENV ?= prod
 build-android: export BUILD_TYPE ?= nightly
 build-android: export ORG_GRADLE_PROJECT_versionCode ?= $(TMP_BUILD_NUMBER)
+build-android: export ANDROID_ABI_SPLIT ?= false
+build-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
 build-android: ##@build Build unsigned Android APK
 	@scripts/build-android.sh
 
 release-android: export TARGET := keytool
 release-android: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
 release-android: keystore build-android ##@build Build signed Android APK
-	@scripts/sign-android.sh result/app-arm64-v8a-release-unsigned.apk
+	@scripts/sign-android.sh result/app-release-unsigned.apk
 
 release-ios: export TARGET := ios
 release-ios: export IOS_STATUS_GO_TARGETS := ios/arm64
@@ -315,7 +317,7 @@ lint: ##@test Run code style checks
 	scripts/lint/translations.clj && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
 	sh scripts/lint/trailing-newline.sh && \
-	node_modules/.bin/prettier --check .
+	node_modules/.bin/prettier --write .
 
 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
 lint-fix: export TARGET := clojure
@@ -351,17 +353,13 @@ test: export SHADOW_NS_REGEXP := .*-test$$
 test: ##@test Run all Clojure tests
 test: _test-clojure
 
-# Note: we need to override the :output-to and :ns-regexp options because
-# shadow-cljs has a bug where it will not read from the env vars to expand the
-# configuration when the shadow-cljs mobile target is already running.
 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: ##@test Watch all Clojure tests and support REPL connections
-	rm -f "$$SHADOW_OUTPUT_TO" && \
 	yarn install && shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
-		"yarn shadow-cljs watch test --verbose --config-merge '{:output-to \"$(SHADOW_OUTPUT_TO)\" :ns-regexp \"$(SHADOW_NS_REGEXP)\"}'" \
+		'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"
 
 test-unit: export SHADOW_OUTPUT_TO := target/unit_test/test.js
@@ -449,22 +447,6 @@ 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    :'

VERSION

@@ -1 +1 @@
-2.30.0
+2.29.0

android/app/build.gradle

@@ -211,7 +211,7 @@ android {
             reset()
             enable getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()
             include getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
-            universalApk false
+            universalApk true
         }
     }
     signingConfigs {

android/app/src/main/AndroidManifest.xml

@@ -70,30 +70,8 @@
                 <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" />

android/gradle.properties

@@ -38,10 +38,10 @@ KEYSTORE_PASSWORD=password
 KEYSTORE_ALIAS=status
 KEYSTORE_KEY_PASSWORD=password
 
-# Splitting by CPU Architecture produces smaller APKs.
-ANDROID_ABI_SPLIT=true
-# By default its better to only build apk for most recent devices.
-ANDROID_ABI_INCLUDE=arm64-v8a
+# By default we build a mostly universal APK
+ANDROID_ABI_SPLIT=false
+# Some platforms are excluded though
+ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64
 
 org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC
 

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.8.12'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -71,8 +71,12 @@ pipeline {
         }
         stage('Upload') {
           steps { script {
-            def urls = apks.collect { s5cmd.upload(it) }
-            env.PKG_URL = urls.first()
+            def urls = apks.collect { s3.uploadArtifact(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. */
+              env.PKG_URL = urls.first()
+            }
             jenkins.setBuildDesc(APK: env.PKG_URL)
           } }
         }

ci/Jenkinsfile.combined

@@ -1,7 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
-
-import groovy.json.JsonBuilder
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
   agent { label 'linux' }
@@ -74,7 +72,7 @@ pipeline {
           iOS: utils.pkgUrl(ios),
           Diawi: utils.getEnv(ios, 'DIAWI_URL'),
           /* upload the sha256 checksums file too */
-          SHA: s5cmd.upload(sha),
+          SHA: s3.uploadArtifact(sha),
         ]
         /* add URLs to the build description */
         jenkins.setBuildDesc(urls)
@@ -85,7 +83,7 @@ pipeline {
       steps { script {
         switch (utils.getBuildType()) {
           case 'nightly': /* Create JSON file with newest build URLs */
-            updateBucketJSON(urls, 'latest.json');
+            s3.updateBucketJSON(urls, 'latest.json');
             break;
           case 'release':
             github.publishReleaseFiles(repo: 'status-mobile');
@@ -116,22 +114,3 @@ 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.9.4'
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.8.12'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.8.12'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -75,7 +75,7 @@ pipeline {
     stage('Upload') {
       steps {
         script {
-          env.PKG_URL = s5cmd.upload(LOG_FILE)
+          env.PKG_URL = s3.uploadArtifact(LOG_FILE)
         }
       }
     }

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
 
@@ -99,7 +99,7 @@ pipeline {
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \
-                -m \"nightly\" \
+                -m \"new_ui_critical or new_ui_medium\" \
                 -k \"${params.KEYWORD_EXPRESSION}\" \
                 --apk=${params.APK_URL ?: apk_path}
             """

ci/tests/Jenkinsfile.e2e-prs

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
 
@@ -35,11 +35,13 @@ pipeline {
       description: 'OBSOLETE ARGUMENT TO BE REMOVED',
       defaultValue: 'DUMMY',
     )
+    /* Commented to use TEST_MARKERS values from job params
     string(
       name: 'TEST_MARKERS',
       description: 'Marker expression for matching tests to run.',
-      defaultValue: 'smoke',
+      defaultValue: 'new_ui_critical',
     )
+    */
   }
 
   options {

ci/tests/Jenkinsfile.e2e-upgrade

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

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.nix-cache

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.4'
+library 'status-jenkins-lib@v1.8.12'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/tools/Jenkinsfile.playstore-meta

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

ci/tools/Jenkinsfile.xcode-clean

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

doc/README.md

@@ -1,43 +1,67 @@
-## Getting Started
+## Getting Started 
+
+[Starting Guide](starting-guide.md)
+
+[IDE Setup](ide-setup.md)
+
 
-- [Starting Guide](starting-guide.md)
-- [IDE Setup](ide-setup.md)
 
 ## Development Process
 
-- [Coding guidelines](new-guidelines.md)
-- [UI components coding guidelines](ui-guidelines.md)
-- [Release Checklist](release-checklist.md)
-- [Release Guide](release-guide.md)
-- [Merging PR process](merging-pr-process.md)
-- [PR Review Policy](pr-review-policy.md)
-- [Working on PR together with QA team](pipeline_process.md)
-- [Debugging](debugging.md)
-- [Patching](patching.md)
-- [Creating a pixel perfect UI](pixel-perfection.md)
-- [Contributing to status-go](status-go-changes.md)
-- [Malli schemas (recorded demo)](https://www.youtube.com/watch?v=SlRio70aYVI) ([slides](files/forging-code-with-schemas-sep-2023-slides.pdf))
+[Coding guidelines](new-guidelines.md)
+
+[UI components coding guidelines](ui-guidelines.md)
+
+[Release Checklist](release-checklist.md)
+
+[Release Guide](release-guide.md)
+
+[Merging PR process](merging-pr-process.md)
+
+[PR Review Policy](pr-review-policy.md)
+
+[Working on PR together with QA team](pipeline_process.md)
+
+[Debugging](debugging.md)
+
+[Patching](patching.md)
+
+[Creating a pixel perfect UI](pixel-perfection.md)
+
+[Contributing to status-go](status-go-changes.md)
+
+[Malli schemas (recorded demo)](https://www.youtube.com/watch?v=SlRio70aYVI) ([slides](files/forging-code-with-schemas-sep-2023-slides.pdf))
 
 ## Testing
 
-- [Overview](tests/tests-overview.md)
-- [How to run local tests](tests/how-to-run-local-tests.md)
-- [End-to-end tests (e2e) overview](tests/how-to-launch-e2e.md)
-- [Component tests (jest) overview](tests/component-tests-overview.md)
+[How to run local tests](testing.md)
+
+[End-to-end tests (e2e) overview](how-to-launch-e2e.md)
+
+[Component tests (jest) overview](component-tests-overview.md)
+
 
 ## Project details
 
-- [status-go introduction (recorded meeting)](https://drive.google.com/file/d/1B7TljmTZ8fHkqJH8ChU1Cp4FGDFM03gq/view)
-- [re-frame usage (recorded meeting)](https://drive.google.com/file/d/1qv_E0CEGzQpu_zGXD0gCTU5EvhC2k8Jy/view)
-- [status app functionality demo](https://drive.google.com/file/u/0/d/1PmwsMLTLDNNIdv5_6wvMOwoj2PfT50c6/view)
+[status-go introduction (recorded meeting)](https://drive.google.com/file/d/1B7TljmTZ8fHkqJH8ChU1Cp4FGDFM03gq/view)
+
+[re-frame usage (recorded meeting)](https://drive.google.com/file/d/1qv_E0CEGzQpu_zGXD0gCTU5EvhC2k8Jy/view)
+
+[status app functionality demo](https://drive.google.com/file/u/0/d/1PmwsMLTLDNNIdv5_6wvMOwoj2PfT50c6/view)
 
 ## Misc
 
-- [Importing icons from Figma into project](export-icons.md)
-- [Updating Status APK builds for the F-Droid Android application catalogue](fdroid.md)
-- [Troubleshooting for known errors](troubleshooting.md)
+[Importing icons from Figma into project](export-icons.md)
+
+[Updating Status APK builds for the F-Droid Android application catalogue](fdroid.md)
+
+[Troubleshooting for known errors](troubleshooting.md)
+
+
 
 ## Outdated:
 
-- [Old guidelines](codebase-structure-and-guidelines.md)
-- [Post mortem analysis](post-mortem.md)
+[Old guidelines](codebase-structure-and-guidelines.md)
+
+[Post mortem analysis](post-mortem.md)
+

doc/how-to-launch-e2e.md

@@ -8,7 +8,7 @@ As a part of CI for Status mobile app and in order to ensure there are no regres
 - Automated tests written on Python 3.9 and pytest.
 - Appium (server) and Selenium WebDriver (protocol) are the base of test automation framework.
 
-TestRail is a test case management system tool where we have test cases.
+TestRail is a test case management system tool where we have test cases. 
 
 
 Each of the test case gets a priority (Critical/High/Medium)
@@ -20,21 +20,21 @@ For now we support e2e for Android only.
 Whenever we need to push set of test scripts we create 16 parallel sessions (max, but depending on amount of cases that are included in job) and each thread: 1) uploads Android .apk file to SauceLabs -> 2) runs through the test steps -> 3) receives results whether test failed on particular step or succeeded with no errors -> 3) Parse test results and push them as a Github comment (if the suite ran against respective PR) and into TestRail.
 
 We push **whole automation test suite (currently 155, amount is changing)** against each nightly build (if the nightly builds job succeeded). Results of the test run are saved in TestRail.
-And also we push set of autotests whenever PR with successful builds got moved in to `E2E Tests` column from [Pipeline for QA dashboard ](https://github.com/status-im/status-react/projects/7).
+And also we push set of autotests whenever PR with successful builds got moved in to `E2E Tests` column from [Pipeline for QA dashboard ](https://github.com/status-im/status-react/projects/7). 
 In that case we save results in TestRail as well and push a comment with test results in a respective PR.
 
 For example: https://github.com/status-im/status-react/pull/9147#issuecomment-540008770
 
-![](../images/how-to-launch-e2e/how-to-launch-e2e-1.png)
+![](images/how-to-launch-e2e/how-to-launch-e2e-1.png)
 
 
 The test_send_stt_from_wallet opens link in TestRail https://ethstatus.testrail.net/index.php?/tests/view/890885 where performed steps could be found
-List of all runs performed by test jobs could be found here https://ethstatus.testrail.net/index.php?/runs/overview/14
+List of all runs performed by test jobs could be found here https://ethstatus.testrail.net/index.php?/runs/overview/14 
 
 **For credentials for TestRail to see results ping Chu in DM**:
 
 Opening any test run navigates you to list of test cases with results:
-![](../images/how-to-launch-e2e/how-to-launch-e2e-2.png)
+![](images/how-to-launch-e2e/how-to-launch-e2e-2.png)
 
 
 ## What about launching e2e manually
@@ -53,12 +53,12 @@ Params to specify:
 - test_marks: tests by priorities (by default: `critical or high or medium`, which corresponds the whole suite; to launch the same suite as in PRs, use `critical or high`)
 - testrail_case_id: here is the list of test cases which you may find in test rail (4-digit value)
 
-For easier access you can hit `Rerun tests` in GH comment and testrail_case_id/ apk_name/ pr_id  will be filled automatically. For making sure that tests are being rerun on most recent e2e build it is recommended to paste link to the last e2e build in apk_name field. The list of PR builds can be found in Jenkins Builds block on PR page.
-![](../images/how-to-launch-e2e/how-to-launch-e2e-3.png)
+For easier access you can hit `Rerun tests` in GH comment and testrail_case_id/ apk_name/ pr_id  will be filled automatically. For making sure that tests are being rerun on most recent e2e build it is recommended to paste link to the last e2e build in apk_name field. The list of PR builds can be found in Jenkins Builds block on PR page. 
+![](images/how-to-launch-e2e/how-to-launch-e2e-3.png) 
 And then hit ‘Build’.
 Once the job starts it picks up specified tests, runs them against provided apk and sends results to pull request.
 
-Even we have 16 parallel sessions for testing it’s a time consuming operation (whole test suite we have automated at the moment takes ~140 minutes to finish).
+Even we have 16 parallel sessions for testing it’s a time consuming operation (whole test suite we have automated at the moment takes ~140 minutes to finish). 
 So for PRs we pick only set of `critical or high` (you can also use this in TEST_MARKS param for job)
 tests (otherwise some PRs could wait their turn of the scheduled Jenkins job till the next day).
 
@@ -78,9 +78,9 @@ Several examples of when test fails to succeed:
 
 - **Valid issue in the automated test scripts** - that's what we're looking for
 
-Example: here is the test results https://github.com/status-im/status-react/pull/13015#issuecomment-1016495043 where one test failed.
+Example: here is the test results https://github.com/status-im/status-react/pull/13015#issuecomment-1016495043 where one test failed. 
     1. Open the test in TestRail and open session recorded for this test in SauceLabs
-![](../images/how-to-launch-e2e/how-to-launch-e2e-4.png)
+![](images/how-to-launch-e2e/how-to-launch-e2e-4.png)
 
 
 In TestRail you may find all the steps performed by the test.
@@ -98,6 +98,6 @@ Not all features of the app could be covered by e2e at the moment:
 ## Brief flow for test to be automated
 
 Whenever there is a need to have a new test:
-1) Create a test scenario in TestRail.
+1) Create a test scenario in TestRail. 
 2) If certain item could be checked in scope of existing test case we update existing one (otherwise we may have thousands of test cases which is overkill to manage in TestRail as well as in automated test scripts). And also complex autotests increase probability to not catch regressions by stopping test execution (due to valid bug or changed feature) keeping the rest test steps uncovered. So here we need to balance when it makes sense to update existing test case with more checks.
 3) Then we create test script based on the test case, ensure test passes for the build and pushing the changes to repo.

doc/merging-pr-process.md

@@ -32,16 +32,14 @@ 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, merge the status-go PR first.
-4) Once merged, tag the merged commit with the new version and push the tag:
+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:
 ```
   git checkout develop
   git pull develop
-  make tag-version
+  git tag vx.y.z
   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

@@ -32,9 +32,9 @@ Ready for testing, a PR should meet the following criteria:
 ### E2E tests and analyzing the results
 
 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.
+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/tests/how-to-launch-e2e.md).
+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.
 
 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`).
@@ -46,14 +46,14 @@ Please, respect this rule.**
 
 ### 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.
+**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.
+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!
 
@@ -72,7 +72,7 @@ The QA team appreciates your help!
 - 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.
 
@@ -86,7 +86,7 @@ After that the developer merges PR into develop.
 _**How do I know if a design review is needed?**_
 
 There are three cases here depending on the changes in the PR:
-1. **Functional PRs with UI changes:** after the ```Tested - OK``` label is added, the QA moves the PR to the ```Design review``` column + mentions ```@Francesca-G``` in comments.
+1. **Functional PRs with UI changes:** after the ```Tested - OK``` label is added, the QA moves the PR to the ```Design review``` column + mentions ```@Francesca-G``` in comments. 
 2. **Component PRs:** once the PR has received a review from developers and e2e tests results, it can be moved directly to the ```Design review``` column by the developer (manual testing step can be skipped) + the developer mentions ```@Francesca-G``` in comments.
 3. **Functional PRs changes in which are not related to UI (e.g. a crash fix):** skip the ```Design review``` step (the PR should only be manually tested by QA).
 
@@ -99,7 +99,7 @@ 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 (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` or if one of the requirements for manual QA was not met.
@@ -120,6 +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)
+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:
+HAPPY DEVELOPMENT! :tada: 

doc/tests/tests-overview.md

@@ -1,167 +0,0 @@
-# Tests
-
-## Introduction
-
-This document provides a general overview of the types of tests we use and when
-to use them. It is not meant to be a tutorial or a detailed documentation about
-testing in software development.
-
-## Types of tests
-
-Tests in `status-mobile` are comprised of:
-
-- Unit tests
-  - Subscription tests
-  - Event tests
-  - Tests for various utilities
-- [Component tests](./component-tests-overview.md)
-- Integration/contract tests
-- [End-to-end tests](./how-to-launch-e2e.md)
-
-We apply the [test
-pyramid](https://en.wikipedia.org/wiki/Test_automation#Testing_at_different_levels)
-strategy, which means we want the majority of tests at the bottom of the
-pyramid. Those should be fast and deterministic and support REPL-Driven
-development (RDD). Slightly above them, we have component tests, then
-integration/contract tests and finally end-to-end tests. The closer to the top
-of the pyramid, the more valuable a test can be, but also more difficult to
-pinpoint why it failed and harder to make it dependable.
-
-*Note*: there are literally dozens of [types of
-tests](https://en.wikipedia.org/wiki/Software_testing), each with its strengths
-and weaknesses.
-
-We tend not to stub or mock implementations in our tests, which means our tests
-are [sociable](https://martinfowler.com/bliki/UnitTest.html).
-
-## What to test?
-
-The UI is driven by global & local state changes caused by events. Global state
-is managed by re-frame and local state by Reagent atoms or React hooks. Except
-for component and end-to-end tests, we test only non-UI code in `status-mobile`.
-Given that the UI is greatly derived from global state, by guaranteeing the
-state is correct we can prevent bugs and, more importantly, reduce the [cost of
-change](https://www.pmi.org/disciplined-agile/agile/costofchange).
-
-We strive to minimize the amount of _business logic_ in views (UI code). We
-achieve this by moving capabilities to status-go and also by adhering to
-re-frame's architecture.
-
-Whenever appropriate (see section `When to test?`), we _may_ test:
-
-- Re-frame events.
-- Re-frame subscriptions.
-- Utility functions.
-- User journeys through integration/contract tests.
-
-Interestingly, we don't test re-frame _effects_ in isolation.
-
-### What are status-mobile integration and contract tests?
-
-The mobile _integration tests_ can be used to "simulate" user interactions and
-make actual calls to status-go via the RPC layer and actually receive signals.
-We can also use these tests to verify the app-db and multiple subscriptions are
-correct. We use the word _simulate_ because there is no UI. Basically, any flow
-that can be driven by re-frame events is possible to automatically test. There
-is no way to change or inspect local state managed by React.
-
-A _contract test_ has the same capabilities as an integration test, but we want
-to draw the line that they should focus more on a particupar RPC endpoint or
-signal, and not on a user journey (e.g. create a wallet account). In the future,
-we may consider running them automatically in status-go.
-
-**Note:** integration tests and contract tests are currently overlapping in
-their responsibilities and still require a clearer distinction.
-
-## When to test?
-
-(Automated) tests basically exist to support rapid software changes, but not
-every piece of code should be tested. The following are general recommendations,
-not rules.
-
-- What would be the consequences to the user of a bug in the implementation you
-  are working on?
-- Can a QA exercise all the branches in the code you changed? Not surprisingly,
-  usually QAs can't test many code paths (it may be nearly impossible), and
-  because PRs are not often tested by reviewers, many PRs can get into `develop`
-  without the necessary quality assurance.
-- How costly was it for you to verify a function/event/etc was correct? Now
-  consider that this cost will be dispersed to every developer who needs to
-  change the implementation if there are no tests.
-- Check the number of conditionals, and if they nest as well. Every conditional
-  may require two different assertions, and the number of assertions can grow
-  exponentially.
-- How complicated are the arguments to the function? If they contain nested maps
-  or data that went through a few transformations, it may be tricky to decipher
-  what they are, unless you are familiar with the code. A test would be able to
-  capture the data, however complex they are.
-
-### When to unit-test subscriptions?
-
-Only test [layer-3
-subscriptions](https://day8.github.io/re-frame/subscriptions/#the-four-layers),
-i.e. don't bother testing extractor subscriptions (check the related
-[guideline](https://github.com/status-im/status-mobile/blob/7774c4eac16fdee950a17bf5d07630c45a980f41/doc/new-guidelines.md#subscription-tests)).
-Some layer-3 subscriptions can still be straightforward and may not be worth
-testing.
-
-- Check the number of _inputs_ to the sub (from the graph). The higher this
-  number, the greater the chance the subscription can break if any of the
-  input's implementation changes.
-
-**Note**: if a tested subscription changes inadvertently, even if its own tests
-still pass, other subscriptions that depend on it and have tests may still fail.
-This is why we don't directly test the subscription handler, but instead, use
-the macro `test-helpers.unit/deftest-sub`.
-
-### When to unit-test events?
-
-A good hint is to ask if you and other CCs need to rely on re-frisk, UI, REPL,
-or FlowStorm to understand the event. If the answer is yes or probably, then a
-test would be prudent.
-
-- Many events only receive arguments and pass them along without much or any
-  transformation to an RPC call. These are straightforward and usually don't
-  need tests ([example](https://github.com/status-im/status-mobile/blob/7774c4eac16fdee950a17bf5d07630c45a980f41/src/status_im/contexts/contact/blocking/events.cljs#L79-L85)).
-- Overall, every event basically returns two effects at most, `:fx` and/or
-  `:db`. Usually, the complicated part lies in the computation to return the new
-  app-db. If the event doesn't perform transformations in the app-db or just
-  does a trivial `assoc`, for example, it may not be worth testing.
-
-For reference, the re-frame author particularly [suggests testing events and
-subscriptions](https://github.com/day8/re-frame/blob/09e2d7132c479aa43f2a64164e54e42bf8511902/docs/Testing.md#what-to-test).
-
-### When to unit-test utility functions?
-
-Most utility functions in `status-mobile` are pure and can be readily and
-cheaply tested.
-
-- If the utility is used in an event/subscription and if the event/subscription
-  has tests, you may prefer to test the event/subscription and not the utility,
-  or the other way around sometimes.
-- If the utility is tricky to verify, such as functions manipulating time, write
-  tests ([example](https://github.com/status-im/status-mobile/blob/7774c4eac16fdee950a17bf5d07630c45a980f41/src/utils/datetime.cljs#L1)).
-- Utilities can be particularly hard to verify by QAs because they can be lower
-  level and require very particular inputs. In such cases, consider writing
-  tests.
-
-### When to write integration/contract tests?
-
-- You want to make real calls to status-go because you think the unit tests are
-  not enough (test pyramid strategy).
-- You constantly need to retest the same things on the UI, sometimes over
-  multiple screens.
-- The flow is too important to rely only on manual QA, which can't always be
-  done due to resource limits, so an integration/contract test fills this gap.
-- You want to rely less on end-to-end tests, which can be more unreliable and
-  slower to change.
-- You want automatic verifications for some area of the mobile app whenever
-  status-go is upgraded.
-
-**Note**: the feedback cycle to write integration tests is longer than unit
-tests because they are slower and harder to debug. Using the REPL with them is
-difficult due to their stateful nature.
-
-### When to test Quo components?
-
-This is covered in [quo/README.md#component-tests](https://github.com/status-im/status-mobile/blob/7774c4eac16fdee950a17bf5d07630c45a980f41/src/quo/README.md#component-tests).

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)
+        theme                  (theme/use-theme-value)
         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)` hook can be used directly in the components
+- `theme/with-theme` wrapper is not needed anymore, `(theme/use-theme-value)` 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
 

ios/Podfile.lock

@@ -1,5 +1,7 @@
 PODS:
   - boost (1.83.0)
+  - BVLinearGradient (2.8.0):
+    - React-Core
   - CryptoSwift (1.5.1)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.73.5)
@@ -915,7 +917,7 @@ PODS:
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
-  - react-native-compat (2.11.2):
+  - react-native-compat (2.12.2):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1159,10 +1161,6 @@ PODS:
     - TOCropViewController
   - RNKeychain (8.1.2):
     - React-Core
-  - RNLinearGradient (3.0.0-alpha.1):
-    - glog
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Core
   - RNPermissions (4.1.5):
     - React-Core
   - RNReanimated (3.6.1):
@@ -1190,6 +1188,7 @@ PODS:
 
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
+  - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
@@ -1270,7 +1269,6 @@ DEPENDENCIES:
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
   - RNKeychain (from `../node_modules/react-native-keychain`)
-  - RNLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNShare (from `../node_modules/react-native-share`)
@@ -1296,6 +1294,8 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   boost:
     :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
+  BVLinearGradient:
+    :path: "../node_modules/react-native-linear-gradient"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
@@ -1451,8 +1451,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-image-crop-picker"
   RNKeychain:
     :path: "../node_modules/react-native-keychain"
-  RNLinearGradient:
-    :path: "../node_modules/react-native-linear-gradient"
   RNPermissions:
     :path: "../node_modules/react-native-permissions"
   RNReanimated:
@@ -1480,12 +1478,13 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
+  BVLinearGradient: 612a04ff38e8480291f3379ee5b5a2c571f03fe0
   CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
   FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
   FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 530710e7949eb12c82670bd09e946becf50a3c2a
+  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
@@ -1517,7 +1516,7 @@ SPEC CHECKSUMS:
   react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
   react-native-blur: 799045500f56146afc46245148080e7b7623cb75
   react-native-cameraroll: af8eec1e585d053ff485d98ec837f9a8a11b5745
-  react-native-compat: 3af9add14d349701306d3d052638435f6795ac2c
+  react-native-compat: 84e00e8dcff9251278c0d48f2bce81f4502e3925
   react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
   react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
   react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
@@ -1562,7 +1561,6 @@ SPEC CHECKSUMS:
   RNGestureHandler: 15c6ef51acba34c49ff03003806cf5dd6098f383
   RNImageCropPicker: 486e2f7e2b0461ce24321f751410dce1b3b49e6d
   RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
-  RNLinearGradient: ccaaebce083b54180da61d992e7fa56abfe000d6
   RNPermissions: 08e619529cced22695f4b6d0efcc0a233e278903
   RNReanimated: dee37576492f1a375017515f5c77e66e5eec696b
   RNShare: 859ff710211285676b0bcedd156c12437ea1d564

ios/StatusIm.xcodeproj/project.pbxproj

@@ -8,9 +8,10 @@
 
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
+		0BF51D8C7FBD6A668E6E1FC0 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45C29909A975E0654116557F /* libPods-Status-StatusIm.a */; };
+		131972279C6DBF736235F9F9 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D9DF8AC0F6547107DE1A25D /* libPods-Status-StatusIm-StatusImTests.a */; };
 		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 */; };
@@ -40,13 +41,11 @@
 		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 */; };
-		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 */; };
@@ -61,6 +60,7 @@
 		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 */; };
+		DE2F1721F9D5702C7CEC5594 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B17DF204648B8189F8ABD0A7 /* libPods-Status-StatusImPR.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,23 +108,23 @@
 		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>"; };
-		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>"; };
-		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>"; };
+		1B74FBFCB9B8E34B63250A52 /* 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>"; };
+		232FE8EAB57384181B0DB836 /* 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>"; };
+		2D9DF8AC0F6547107DE1A25D /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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; };
 		3AAD2ADC24A3A60E0075D594 /* Status PR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Status PR.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
+		45C29909A975E0654116557F /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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; };
-		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>"; };
@@ -132,14 +132,16 @@
 		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>"; };
+		7A393286DD0E844D050D0B89 /* 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>"; };
+		7BF7B2DB23EE09E5229629DA /* 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>"; };
 		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>"; };
 		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>"; };
+		A0B5AD061DF0F6CC98603A99 /* 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>"; };
 		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>"; };
-		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>"; };
+		B17DF204648B8189F8ABD0A7 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		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; };
 		B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Medium.otf"; path = "../resources/fonts/Inter-Medium.otf"; sourceTree = "<group>"; };
@@ -151,9 +153,7 @@
 		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>"; };
-		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>"; };
+		D40C4023C7D5B793AEF98426 /* 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>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				67A3DF2242D5B6C35A4C6A33 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				131972279C6DBF736235F9F9 /* 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 */,
-				231CD38186B86957CFCF645E /* libPods-Status-StatusIm.a in Frameworks */,
+				0BF51D8C7FBD6A668E6E1FC0 /* 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 */,
-				A1B6E23C86E6A40AFE74E925 /* libPods-Status-StatusImPR.a in Frameworks */,
+				DE2F1721F9D5702C7CEC5594 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				5DA19658BCC29789EBB3DE79 /* libPods-Status-StatusIm.a */,
-				A7B7F8B9749AB74BB0697B49 /* libPods-Status-StatusIm-StatusImTests.a */,
-				0E9723BBA39FC5B087C3D475 /* libPods-Status-StatusImPR.a */,
+				45C29909A975E0654116557F /* libPods-Status-StatusIm.a */,
+				2D9DF8AC0F6547107DE1A25D /* libPods-Status-StatusIm-StatusImTests.a */,
+				B17DF204648B8189F8ABD0A7 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				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 */,
+				A0B5AD061DF0F6CC98603A99 /* Pods-Status-StatusIm.debug.xcconfig */,
+				232FE8EAB57384181B0DB836 /* Pods-Status-StatusIm.release.xcconfig */,
+				D40C4023C7D5B793AEF98426 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				1B74FBFCB9B8E34B63250A52 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				7BF7B2DB23EE09E5229629DA /* Pods-Status-StatusImPR.debug.xcconfig */,
+				7A393286DD0E844D050D0B89 /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,12 +341,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				9B331412309D5F5632348AEE /* [CP] Check Pods Manifest.lock */,
+				5937040F3338CDF93E777A93 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				7545D1B37CABFA574D6D6C31 /* [CP] Embed Pods Frameworks */,
-				A3AD03105488DA5BC8E8C199 /* [CP] Copy Pods Resources */,
+				7AD665439C08CFEF5EF84F6A /* [CP] Embed Pods Frameworks */,
+				02C1A8CA208E38DA07BAC311 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -362,15 +362,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				236F25332B0D1B4DCC0E041E /* [CP] Check Pods Manifest.lock */,
+				1DFD6BF757E89B72F40FCEE9 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				37D91248C8178FEAC1661AE0 /* [CP] Embed Pods Frameworks */,
-				BC5CED24C6D00996607C4942 /* [CP] Copy Pods Resources */,
+				50F2A2E15670F86233743A5C /* [CP] Embed Pods Frameworks */,
+				1B623A051F855FC5B09A0480 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -385,15 +385,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				D0B7F25508F9BD7C6B30AF36 /* [CP] Check Pods Manifest.lock */,
+				EB421F3ED78A38D285D771D2 /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				5C9736BD9798020B8F31802B /* [CP] Embed Pods Frameworks */,
-				B76C3637DC2DDBB6E8472904 /* [CP] Copy Pods Resources */,
+				F4561A2D3C9E6C4B66F4C4F5 /* [CP] Embed Pods Frameworks */,
+				6FA1467F7B916ED92FA688E0 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -547,7 +547,55 @@
 			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";
 		};
-		236F25332B0D1B4DCC0E041E /* [CP] Check Pods Manifest.lock */ = {
+		02C1A8CA208E38DA07BAC311 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			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}/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-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		1B623A051F855FC5B09A0480 /* [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;
+		};
+		1DFD6BF757E89B72F40FCEE9 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -569,24 +617,6 @@
 			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;
 		};
-		37D91248C8178FEAC1661AE0 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${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] 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/Pods-Status-StatusIm-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -615,13 +645,13 @@
 			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 */ = {
+		50F2A2E15670F86233743A5C /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh",
+				"${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] Embed Pods Frameworks";
@@ -630,28 +660,10 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		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 */ = {
+		5937040F3338CDF93E777A93 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -673,31 +685,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;
 		};
-		A3AD03105488DA5BC8E8C199 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			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}/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-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		B76C3637DC2DDBB6E8472904 /* [CP] Copy Pods Resources */ = {
+		6FA1467F7B916ED92FA688E0 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -721,31 +709,39 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		BC5CED24C6D00996607C4942 /* [CP] Copy Pods Resources */ = {
+		7AD665439C08CFEF5EF84F6A /* [CP] Embed Pods Frameworks */ = {
 			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",
+				"${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] 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}/RNPermissionsPrivacyInfo.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.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-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D0B7F25508F9BD7C6B30AF36 /* [CP] Check Pods Manifest.lock */ = {
+		E3914A731DF919ED00EBB515 /* 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\n";
+		};
+		EB421F3ED78A38D285D771D2 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -767,19 +763,23 @@
 			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 */ = {
+		F4561A2D3C9E6C4B66F4C4F5 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
+			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 = "Run Script";
+			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
-			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1\n";
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -828,7 +828,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = E089B0F56B6F6715D444A841 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = D40C4023C7D5B793AEF98426 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -865,7 +865,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = EAAD01A6F886D961CE1A9541 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 1B74FBFCB9B8E34B63250A52 /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -898,7 +898,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = B064AF9CEF590E7140F5193F /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = A0B5AD061DF0F6CC98603A99 /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -980,7 +980,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5D2EA2A248267BA083152C22 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 232FE8EAB57384181B0DB836 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -1055,7 +1055,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 2F18074BFB7862090B68D75F /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = 7BF7B2DB23EE09E5229629DA /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1135,7 +1135,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D1249D8E109F0F96FFE2CA6C /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 7A393286DD0E844D050D0B89 /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";

ios/StatusIm/Info.plist

@@ -119,6 +119,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleLightContent</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
@@ -131,7 +133,7 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
+	<false/>
 	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
 	<array>
 		<string>A00000080400010101</string>

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

@@ -246,14 +246,6 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
         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")
@@ -322,11 +314,6 @@ class AccountManager(private val reactContext: ReactApplicationContext) : ReactC
         )
     }
 
-    @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"

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

@@ -62,11 +62,6 @@ public class EncryptionUtils extends ReactContextBaseJavaModule {
         return Statusgo.encodeTransfer(to, value);
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String encodeFunctionCall(final String method, final String paramsJSON) {
-        return Statusgo.encodeFunctionCall(method, paramsJSON);
-    }
-
     @ReactMethod(isBlockingSynchronousMethod = true)
     public String decodeParameters(final String decodeParamJSON) {
         return Statusgo.decodeParameters(decodeParamJSON);
@@ -97,11 +92,6 @@ 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/StatusModule.kt

@@ -76,16 +76,6 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va
         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)

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

@@ -153,9 +153,4 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas
 
         return strArray
     }
-
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    fun validateConnectionString(connectionString: String): String {
-        return Statusgo.validateConnectionString(connectionString)
-    }
 }

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

@@ -195,15 +195,6 @@ 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");
@@ -242,12 +233,4 @@ 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,10 +94,6 @@ 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/RCTStatus.m

@@ -176,24 +176,6 @@ 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/Utils.m

@@ -128,8 +128,4 @@ 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

@@ -302,36 +302,6 @@ 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();
@@ -672,38 +642,6 @@ 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();
@@ -1997,7 +1935,6 @@ 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);
@@ -2008,7 +1945,6 @@ 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);
@@ -2036,7 +1972,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

@@ -711,11 +711,11 @@
   },
 
   {
-    "path": "nubank/matcher-combinators/3.9.1/matcher-combinators-3.9.1",
+    "path": "nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "f0830a112cae8ee931a90d9f39214a0ed4d44150",
-      "sha256": "1rjcgqhms84xmnhs7sqcd3b2dpa37mmzgz2yz33yz2rdb9skl96g"
+      "sha1": "4c94bd510f0c18a20191e46dd6becedebc640bbd",
+      "sha256": "0wpla2hx0s4mda58ndyd8938zmnz1gyhgfr6pzfphy27xfbvsssl"
     }
   },
 

nix/deps/clojure/deps.list

@@ -77,7 +77,7 @@ 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/1.0.0/nrepl-1.0.0.jar
-nubank/matcher-combinators/3.9.1/matcher-combinators-3.9.1.jar
+nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.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

nix/deps/gradle/deps.list

@@ -4,10 +4,12 @@ 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-jvm:1.6.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
+androidx.annotation:annotation:1.6.0
 androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
@@ -45,6 +47,7 @@ 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.9.0
 androidx.cursoradapter:cursoradapter:1.0.0
@@ -67,6 +70,7 @@ androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout: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
 androidx.exifinterface:exifinterface:1.2.0
@@ -484,6 +488,7 @@ 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.73.5
 com.facebook.react:react-android:0.73.5
 com.facebook.soloader:annotation:0.10.5
 com.facebook.soloader:nativeloader:0.10.5
@@ -516,7 +521,15 @@ 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
+com.google.android.datatransport:transport-api:2.2.1
+com.google.android.datatransport:transport-backend-cct:2.3.3
+com.google.android.datatransport:transport-runtime:2.2.6
+com.google.android.gms:play-services-basement:18.0.0
+com.google.android.gms:play-services-base:18.0.1
+com.google.android.gms:play-services-mlkit-barcode-scanning:18.0.0
+com.google.android.gms:play-services-tasks:18.0.1
 com.google.android.material:material:1.2.0-alpha03
+com.google.android.odml:image:1.0.0-beta1
 com.google.android:annotations:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-common-protos:2.0.1
@@ -543,6 +556,10 @@ 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.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
+com.google.firebase:firebase-encoders:16.1.0
 com.google.flatbuffers:flatbuffers-java:1.12.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
@@ -558,6 +575,11 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.j2objc:j2objc-annotations:1.3
 com.google.jimfs:jimfs:1.1
+com.google.mlkit:barcode-scanning-common:17.0.0
+com.google.mlkit:barcode-scanning:17.0.2
+com.google.mlkit:common:18.0.0
+com.google.mlkit:vision-common:17.0.0
+com.google.mlkit:vision-interfaces:16.0.0
 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
@@ -572,7 +594,6 @@ 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
 com.google.test.platform:core-proto:0.0.2-dev
-com.google.zxing:core:3.4.1
 com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
 com.parse.bolts:bolts-tasks:1.4.0
@@ -922,7 +943,4 @@ 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
+com.android.tools.build:gradle:3.5.4

nix/deps/gradle/deps.urls

@@ -87,6 +87,7 @@ https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0
 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/emoji2/emoji2-views-helper/1.2.0/emoji2-views-helper-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/emoji2/emoji2/1.2.0/emoji2-1.2.0.pom
+https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.0.0/exifinterface-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-beta01/exifinterface-1.1.0-beta01.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1.0-rc01/exifinterface-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0.pom
@@ -480,8 +481,26 @@ https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.0.4/zipflinger-
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.1/zipflinger-7.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.3.1/zipflinger-7.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/8.1.1/zipflinger-8.1.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.1/transport-api-2.2.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/2.3.3/transport-backend-cct-2.3.3.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.5/transport-runtime-2.2.5.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.6/transport-runtime-2.2.6.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/18.0.0/play-services-basement-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/18.0.1/play-services-base-18.0.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-mlkit-barcode-scanning/18.0.0/play-services-mlkit-barcode-scanning-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/18.0.1/play-services-tasks-18.0.1.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom
+https://dl.google.com/dl/android/maven2/com/google/android/odml/image/1.0.0-beta1/image-1.0.0-beta1.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-annotations/16.0.0/firebase-annotations-16.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/16.1.0/firebase-components-16.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-json/17.1.0/firebase-encoders-json-17.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders/16.1.0/firebase-encoders-16.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/mlkit/barcode-scanning-common/17.0.0/barcode-scanning-common-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/mlkit/barcode-scanning/17.0.2/barcode-scanning-17.0.2.pom
+https://dl.google.com/dl/android/maven2/com/google/mlkit/common/18.0.0/common-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/mlkit/vision-common/17.0.0/vision-common-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/mlkit/vision-interfaces/16.0.0/vision-interfaces-16.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/prefab/cli/2.0.0/cli-2.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha04/core-proto-0.0.8-alpha04.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha07/core-proto-0.0.8-alpha07.pom
@@ -504,12 +523,12 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-cod
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.pom
-https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.1/commons-codec-1.17.1.pom
+https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.17.0/commons-codec-1.17.0.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.16.1/commons-io-2.16.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
-https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.3/commons-logging-1.3.3.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.2/commons-logging-1.3.2.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
@@ -609,22 +628,22 @@ https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloa
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.5/soloader-0.10.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.2/jackson-annotations-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.17.1/jackson-annotations-2.17.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.2/jackson-core-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.17.1/jackson-core-2.17.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.2/jackson-databind-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.17.1/jackson-databind-2.17.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.2/jackson-base-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.17.1/jackson-base-2.17.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.2/jackson-bom-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.17.1/jackson-bom-2.17.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.17/jackson-parent-2.17.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.2/jackson-modules-base-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.17.1/jackson-modules-base-2.17.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.2/jackson-module-jaxb-annotations-2.17.2.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.17.1/jackson-module-jaxb-annotations-2.17.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/58/oss-parent-58.pom
@@ -652,11 +671,11 @@ https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/7/auto-parent-7
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.3/auto-value-annotations-1.6.3.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.11.0/auto-value-annotations-1.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.10.4/auto-value-annotations-1.10.4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.2/auto-value-parent-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.3/auto-value-parent-1.6.3.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.7.4/auto-value-parent-1.7.4.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.11.0/auto-value-parent-1.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.10.4/auto-value-parent-1.10.4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom
@@ -668,7 +687,7 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.5/gson
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.6/gson-parent-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.9/gson-parent-2.8.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.9.1/gson-parent-2.9.1.pom
-https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.11.0/gson-parent-2.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.10.1/gson-parent-2.10.1.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.2.4.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.pom
@@ -677,7 +696,7 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.6/gson-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.9/gson-2.8.9.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.9.1/gson-2.9.1.pom
-https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.11.0/gson-2.11.0.pom
+https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.10.1/gson-2.10.1.pom
 https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.3.0-rc2/tink-1.3.0-rc2.pom
 https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.7.0/tink-1.7.0.pom
 https://repo.maven.apache.org/maven2/com/google/dagger/dagger/2.28.3/dagger-2.28.3.pom
@@ -692,8 +711,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.10.0/error_prone_annotations-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.0/error_prone_annotations-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.29.2/error_prone_annotations-2.29.2.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.27.1/error_prone_annotations-2.27.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -705,8 +723,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.10.0/error_prone_parent-2.10.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.11.0/error_prone_parent-2.11.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.0/error_prone_parent-2.27.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.29.2/error_prone_parent-2.29.2.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.27.1/error_prone_parent-2.27.1.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
@@ -723,8 +740,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-android/guava-parent-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.1-jre/guava-parent-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.2.1-jre/guava-parent-33.2.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.2.1-jre/guava-testlib-33.2.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.2.0-jre/guava-parent-33.2.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.2.0-jre/guava-testlib-33.2.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -737,7 +754,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-android/guava-31.0.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.2.1-jre/guava-33.2.1-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/33.2.0-jre/guava-33.2.0-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -751,7 +768,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.13.0/pro
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.17.2/protobuf-bom-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.2/protobuf-bom-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/3.19.3/protobuf-bom-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.28.0-RC1/protobuf-bom-4.28.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.27.0-RC3/protobuf-bom-4.27.0-RC3.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.17.2/protobuf-javalite-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
@@ -768,7 +785,7 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.13.0/pr
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.17.2/protobuf-java-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.19.3/protobuf-java-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.28.0-RC1/protobuf-java-4.28.0-RC1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.27.0-RC3/protobuf-java-4.27.0-RC3.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-lite/3.0.1/protobuf-lite-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/protobuf-parent-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4.0/protobuf-parent-3.4.0.pom
@@ -779,11 +796,9 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.2/protobuf-parent-3.19.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.19.3/protobuf-parent-3.19.3.pom
-https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.28.0-RC1/protobuf-parent-4.28.0-RC1.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.4/truth-parent-1.4.4.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.4/truth-1.4.4.pom
-https://repo.maven.apache.org/maven2/com/google/zxing/core/3.4.1/core-3.4.1.pom
-https://repo.maven.apache.org/maven2/com/google/zxing/zxing-parent/3.4.1/zxing-parent-3.4.1.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.27.0-RC3/protobuf-parent-4.27.0-RC3.pom
+https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.4.2/truth-parent-1.4.2.pom
+https://repo.maven.apache.org/maven2/com/google/truth/truth/1.4.2/truth-1.4.2.pom
 https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
 https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom
 https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom
@@ -954,11 +969,9 @@ https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.15/byte
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.15/byte-buddy-parent-1.14.15.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.17/byte-buddy-parent-1.14.17.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.15/byte-buddy-1.14.15.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.17/byte-buddy-1.14.17.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -1003,7 +1016,6 @@ https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
-https://repo.maven.apache.org/maven2/org/apache/apache/32/apache-32.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.pom
@@ -1023,7 +1035,6 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/69/commons-parent-69.pom
-https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/71/commons-parent-71.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1078,7 +1089,7 @@ https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/che
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.45.0/checker-qual-3.45.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.43.0/checker-qual-3.43.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/groovy-xml-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.10/groovy-xml-3.0.10.pom
@@ -1088,21 +1099,21 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotation
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.17/animal-sniffer-annotations-1.17.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.18/animal-sniffer-annotations-1.18.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.19/animal-sniffer-annotations-1.19.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.24/animal-sniffer-annotations-1.24.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.23/animal-sniffer-annotations-1.23.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.14/animal-sniffer-parent-1.14.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.17/animal-sniffer-parent-1.17.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.18/animal-sniffer-parent-1.18.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.19/animal-sniffer-parent-1.19.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.24/animal-sniffer-parent-1.24.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.23/animal-sniffer-parent-1.23.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-parent-34.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/40/mojo-parent-40.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/50/mojo-parent-50.pom
-https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/84/mojo-parent-84.pom
+https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/74/mojo-parent-74.pom
 https://repo.maven.apache.org/maven2/org/codehaus/woodstox/stax2-api/4.2.1/stax2-api-4.2.1.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
-https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.3.0/easymock-parent-5.3.0.pom
-https://repo.maven.apache.org/maven2/org/easymock/easymock/5.3.0/easymock-5.3.0.pom
+https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.2.0/easymock-parent-5.2.0.pom
+https://repo.maven.apache.org/maven2/org/easymock/easymock/5.2.0/easymock-5.2.0.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.2/angus-activation-project-2.0.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.2/angus-activation-2.0.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.2/project-1.0.2.pom
@@ -1133,10 +1144,9 @@ https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.1/txw2-2.3.1.po
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.3.2/txw2-2.3.2.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.5/txw2-4.0.5.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
-https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/3.0-rc1/hamcrest-core-3.0-rc1.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
-https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/3.0-rc1/hamcrest-3.0-rc1.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.12/org.jacoco.build-0.8.12.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
@@ -1236,7 +1246,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.8.20-RC2/kotlin-reflect-1.8.20-RC2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.20-Beta2/kotlin-reflect-2.0.20-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-RC3/kotlin-reflect-2.0.0-RC3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.8.0/kotlin-scripting-common-1.8.0.pom
@@ -1341,7 +1351,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.20-R
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.21/kotlin-stdlib-1.8.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.20-Beta2/kotlin-stdlib-2.0.20-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-RC3/kotlin-stdlib-2.0.0-RC3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.8.0/kotlin-tooling-core-1.8.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.9.0/kotlin-tooling-core-1.9.0.pom
@@ -1360,8 +1370,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trov
 https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20240303/json-20240303.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
-https://repo.maven.apache.org/maven2/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0-M2/junit-bom-5.11.0-M2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.11.0-M1/junit-bom-5.11.0-M1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
@@ -1372,10 +1381,8 @@ https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.12.0/mockito-cor
 https://repo.maven.apache.org/maven2/org/mockito/mockito-inline/4.0.0/mockito-inline-4.0.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom
-https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.4/objenesis-parent-3.4.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.3/objenesis-3.3.pom
-https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.4/objenesis-3.4.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0/asm-analysis-6.0.pom

nix/deps/gradle/generate.sh

@@ -56,8 +56,6 @@ 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/mobile/android/build.nix

@@ -18,10 +18,10 @@
   buildUrl ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_buildUrl" null,
   statusGoSrcOverride ? lib.getEnvWithDefault "STATUS_GO_SRC_OVERRIDE" null,
   # If APKs should be split based on architectures
-  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "true",
+  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "false",
   # Android architectures to build for
   # Used to detect end-to-end builds
-  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "arm64-v8a",
+  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "armeabi-v7a;arm64-v8a;x86",
 }:
 
 let

nix/overlay.nix

@@ -57,7 +57,7 @@ in {
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
   openjdk = super.openjdk11_headless;
   xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    versions = ["15.1" "15.2" "15.3" "15.4"];
+    versions = ["15.1" "15.2" "15.3"];
   };
   go = super.go_1_21;
   clang = super.clang_15;
@@ -80,7 +80,7 @@ in {
     androidPkgs = self.androidEnvCustom.compose;
   };
 
-  # Android environment
+  # Android environement
   androidEnvCustom = callPackage ./pkgs/android-sdk { };
   androidPkgs = self.androidEnvCustom.pkgs;
   androidShell = self.androidEnvCustom.shell;

package.json

@@ -20,10 +20,9 @@
     "@react-native-community/netinfo": "^4.4.0",
     "@react-native-community/push-notification-ios": "^1.4.1",
     "@react-native-community/slider": "^3.0.0",
-    "@walletconnect/react-native-compat": "2.11.2",
-    "@walletconnect/web3wallet": "1.10.2",
+    "@walletconnect/react-native-compat": "^2.12.2",
+    "@walletconnect/web3wallet": "^1.11.2",
     "base-64": "^1.0.0",
-    "big-integer": "1.6.51",
     "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/v4.0.2-status",
     "chance": "^1.1.0",
     "emojilib": "^2.4.0",
@@ -41,7 +40,7 @@
     "react-native-background-timer": "^2.1.1",
     "react-native-biometrics": "^3.0.1",
     "react-native-blob-util": "^0.13.18",
-    "react-native-camera-kit": "git+https://github.com/status-im/react-native-camera-kit.git#refs/tags/v14.0.0-beta15-status-v1",
+    "react-native-camera-kit": "14.0.0-beta13",
     "react-native-config": "^1.5.0",
     "react-native-dialogs": "1.1.2",
     "react-native-draggable-flatlist": "4.0.1",
@@ -54,7 +53,7 @@
     "react-native-image-crop-picker": "0.40.0",
     "react-native-image-resizer": "^1.2.3",
     "react-native-keychain": "8.1.2",
-    "react-native-linear-gradient": "3.0.0-alpha.1",
+    "react-native-linear-gradient": "^2.8.0",
     "react-native-lottie-splash-screen": "^1.0.1",
     "react-native-navigation": "7.39.0",
     "react-native-orientation-locker": "^1.5.0",
@@ -97,8 +96,7 @@
     "jest-silent-reporter": "^0.5.0",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
-    "prettier": "^3.3.3",
-    "prettier-plugin-sort-json": "^4.0.0",
+    "prettier": "^2.8.8",
     "process": "0.11.10",
     "react-test-renderer": "18.1.0",
     "shadow-cljs": "2.26.2",

scripts/build-android.sh

@@ -45,8 +45,6 @@ SECRETS_ENV_VARS=(
     'INFURA_TOKEN'
     'INFURA_TOKEN_SECRET'
     'OPENSEA_API_KEY'
-    'MIXPANEL_APP_ID'
-    'MIXPANEL_TOKEN'
     'POKT_TOKEN'
 )
 

scripts/run-android.sh

@@ -13,7 +13,7 @@ export BUILD_TYPE=debug
 
 # Install the APK on running emulator or android device.
 installAndLaunchApp() {
-  adb install -r ./result/app-arm64-v8a-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
+  adb install -r ./result/app-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
   "${GIT_ROOT}/scripts/wait-for-metro-port.sh" 2>&1
   # connected android devices need this port to be exposed for metro
   adb reverse "tcp:${RCT_METRO_PORT}" "tcp:${RCT_METRO_PORT}"

shadow-cljs.edn

@@ -19,7 +19,7 @@
                 [cider/piggieback "0.4.1"]
                 [org.slf4j/slf4j-nop "2.0.9"]
                 [re-frisk-remote "1.6.0"]
-                [nubank/matcher-combinators "3.9.1"]
+                [nubank/matcher-combinators "3.8.8"]
 
                 ;; Use the same version specified in the Nix dependency.
                 [clj-kondo/clj-kondo "2024.03.13"]
@@ -67,10 +67,6 @@
          :closure-defines
          {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
           status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
-          status-im.config/STATUS_BUILD_PROXY_USER        #shadow/env "STATUS_BUILD_PROXY_USER"
-          status-im.config/STATUS_BUILD_PROXY_PASSWORD    #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
-          status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
-          status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
           status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
           status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
           status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
@@ -105,11 +101,7 @@
    {:closure-defines
     {status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
      status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
-     status-im.config/STATUS_BUILD_PROXY_USER        #shadow/env "STATUS_BUILD_PROXY_USER"
-     status-im.config/STATUS_BUILD_PROXY_PASSWORD    #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
      status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
-     status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
-     status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
      status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
      status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
      status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
@@ -139,8 +131,7 @@
    :output-dir "target/test"
    :optimizations :simple
    :target :node-test
-   :dev {:devtools {:preloads [status-im.setup.schema-preload
-                               status-im.setup.test-preload]}}
+   :dev {:devtools {:preloads [status-im.setup.schema-preload]}}
    ;; Uncomment line below to `make test-watch` a specific file
    :ns-regexp #shadow/env "SHADOW_NS_REGEXP"
    :main legacy.status-im.test-runner/main
@@ -151,8 +142,6 @@
     status-im.config/POKT_TOKEN                     #shadow/env "POKT_TOKEN"
     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
     status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
-    status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
-    status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"

src/keycard/keycard.cljs

@@ -1,277 +1,38 @@
-(ns keycard.keycard
-  (:require
-    ["react-native" :as rn]
-    ["react-native-status-keycard" :default status-keycard]
-    [react-native.platform :as platform]
-    [taoensso.timbre :as log]
-    [utils.address :as address]))
+(ns keycard.keycard)
 
-(defonce event-emitter
-  (if platform/ios?
-    (new (.-NativeEventEmitter rn) status-keycard)
-    (.-DeviceEventEmitter rn)))
-
-(defn start-nfc
-  [{:keys [on-success on-failure prompt-message]}]
-  (log/debug "start-nfc")
-  (.. status-keycard
-      (startNFC (str prompt-message))
-      (then on-success)
-      (catch on-failure)))
-
-(defn stop-nfc
-  [{:keys [on-success on-failure error-message]}]
-  (log/debug "stop-nfc")
-  (.. status-keycard
-      (stopNFC (str error-message))
-      (then on-success)
-      (catch on-failure)))
-
-(defn set-nfc-message
-  [{:keys [on-success on-failure status-message]}]
-  (log/debug "set-nfc-message")
-  (.. status-keycard
-      (setNFCMessage (str status-message))
-      (then on-success)
-      (catch on-failure)))
-
-(defn check-nfc-support
-  [{:keys [on-success]}]
-  (.. status-keycard
-      nfcIsSupported
-      (then on-success)))
-
-(defn check-nfc-enabled
-  [{:keys [on-success]}]
-  (.. status-keycard
-      nfcIsEnabled
-      (then on-success)))
-
-(defn open-nfc-settings
-  []
-  (.openNfcSettings status-keycard))
-
-(defn remove-event-listeners
-  []
-  (doseq [event ["keyCardOnConnected" "keyCardOnDisconnected" "keyCardOnNFCUserCancelled"
-                 "keyCardOnNFCTimeout"]]
-    (.removeAllListeners ^js event-emitter event)))
-
-(defn remove-event-listener
-  [^js event]
-  (when event
-    (.remove event)))
-
-(defn on-card-connected
-  [callback]
-  (.addListener ^js event-emitter "keyCardOnConnected" callback))
-
-(defn on-card-disconnected
-  [callback]
-  (.addListener ^js event-emitter "keyCardOnDisconnected" callback))
-
-(defn on-nfc-user-cancelled
-  [callback]
-  (.addListener ^js event-emitter "keyCardOnNFCUserCancelled" callback))
-
-(defn on-nfc-timeout
-  [callback]
-  (.addListener ^js event-emitter "keyCardOnNFCTimeout" callback))
-
-(defn on-nfc-enabled
-  [callback]
-  (.addListener ^js event-emitter "keyCardOnNFCEnabled" callback))
-
-(defn on-nfc-disabled
-  [callback]
-  (.addListener ^js event-emitter "keyCardOnNFCDisabled" callback))
-
-(defn set-pairings
-  [pairings]
-  (.. status-keycard (setPairings (clj->js (or pairings {})))))
-
-(defn get-application-info
-  [{:keys [on-success on-failure]}]
-  (.. status-keycard
-      (getApplicationInfo)
-      (then (fn [response]
-              (let [info (-> response
-                             (js->clj :keywordize-keys true)
-                             (update :key-uid address/normalized-hex))]
-                (on-success info))))
-      (catch on-failure)))
-
-(defn factory-reset
-  [{:keys [on-success on-failure]}]
-  (.. status-keycard
-      (factoryReset)
-      (then (fn [response]
-              (let [info (-> response
-                             (js->clj :keywordize-keys true)
-                             (update :key-uid address/normalized-hex))]
-                (on-success info))))
-      (catch on-failure)))
-
-(defn install-applet
-  [{:keys [on-success on-failure]}]
-  (.. status-keycard
-      installApplet
-      (then on-success)
-      (catch on-failure)))
-
-(defn install-cash-applet
-  [{:keys [on-success on-failure]}]
-  (.. status-keycard
-      installCashApplet
-      (then on-success)
-      (catch on-failure)))
-
-(defn init-card
-  [{:keys [pin on-success on-failure]}]
-  (.. status-keycard
-      (init pin)
-      (then on-success)
-      (catch on-failure)))
-
-(defn install-applet-and-init-card
-  [{:keys [pin on-success on-failure]}]
-  (.. status-keycard
-      (installAppletAndInitCard pin)
-      (then on-success)
-      (catch on-failure)))
-
-(defn pair
-  [{:keys [password on-success on-failure]}]
-  (when password
-    (.. status-keycard
-        (pair password)
-        (then on-success)
-        (catch on-failure))))
-
-(defn generate-and-load-key
-  [{:keys [mnemonic pin on-success on-failure]}]
-  (.. status-keycard
-      (generateAndLoadKey mnemonic pin)
-      (then on-success)
-      (catch on-failure)))
-
-(defn unblock-pin
-  [{:keys [puk new-pin on-success on-failure]}]
-  (when (and new-pin puk)
-    (.. status-keycard
-        (unblockPin puk new-pin)
-        (then on-success)
-        (catch on-failure))))
-
-(defn verify-pin
-  [{:keys [pin on-success on-failure]}]
-  (when (not-empty pin)
-    (.. status-keycard
-        (verifyPin pin)
-        (then on-success)
-        (catch on-failure))))
-
-(defn change-pin
-  [{:keys [current-pin new-pin on-success on-failure]}]
-  (when (and current-pin new-pin)
-    (.. status-keycard
-        (changePin current-pin new-pin)
-        (then on-success)
-        (catch on-failure))))
-
-(defn change-puk
-  [{:keys [pin puk on-success on-failure]}]
-  (when (and pin puk)
-    (.. status-keycard
-        (changePUK pin puk)
-        (then on-success)
-        (catch on-failure))))
-
-(defn change-pairing
-  [{:keys [pin pairing on-success on-failure]}]
-  (when (and pin pairing)
-    (.. status-keycard
-        (changePairingPassword pin pairing)
-        (then on-success)
-        (catch on-failure))))
-
-(defn unpair
-  [{:keys [pin on-success on-failure]}]
-  (when pin
-    (.. status-keycard
-        (unpair pin)
-        (then on-success)
-        (catch on-failure))))
-
-(defn delete
-  [{:keys [on-success on-failure]}]
-  (.. status-keycard
-      (delete)
-      (then on-success)
-      (catch on-failure)))
-
-(defn remove-key
-  [{:keys [pin on-success on-failure]}]
-  (.. status-keycard
-      (removeKey pin)
-      (then on-success)
-      (catch on-failure)))
-
-(defn remove-key-with-unpair
-  [{:keys [pin on-success on-failure]}]
-  (.. status-keycard
-      (removeKeyWithUnpair pin)
-      (then on-success)
-      (catch on-failure)))
-
-(defn export-key
-  [{:keys [pin path on-success on-failure]}]
-  (.. status-keycard
-      (exportKeyWithPath pin path)
-      (then on-success)
-      (catch on-failure)))
-
-(defn unpair-and-delete
-  [{:keys [pin on-success on-failure]}]
-  (when (not-empty pin)
-    (.. status-keycard
-        (unpairAndDelete pin)
-        (then on-success)
-        (catch on-failure))))
-
-(defn import-keys
-  [{:keys [pin on-success on-failure]}]
-  (when (not-empty pin)
-    (.. status-keycard
-        (importKeys pin)
-        (then on-success)
-        (catch on-failure))))
-
-(defn get-keys
-  [{:keys [pin on-success on-failure]}]
-  (when (not-empty pin)
-    (.. status-keycard
-        (getKeys pin)
-        (then on-success)
-        (catch on-failure))))
-
-(defn sign
-  [{pin :pin path :path card-hash :hash on-success :on-success on-failure :on-failure}]
-  (when (and pin card-hash)
-    (if path
-      (.. status-keycard
-          (signWithPath pin path card-hash)
-          (then on-success)
-          (catch on-failure))
-      (.. status-keycard
-          (sign pin card-hash)
-          (then on-success)
-          (catch on-failure)))))
-
-(defn sign-typed-data
-  [{card-hash :hash on-success :on-success on-failure :on-failure}]
-  (when card-hash
-    (.. status-keycard
-        (signPinless card-hash)
-        (then on-success)
-        (catch on-failure))))
+(defprotocol Keycard
+  (start-nfc [this args])
+  (stop-nfc [this args])
+  (set-nfc-message [this args])
+  (check-nfc-support [this args])
+  (check-nfc-enabled [this args])
+  (open-nfc-settings [this])
+  (register-card-events [this args])
+  (set-pairings [this args])
+  (on-card-disconnected [this callback])
+  (on-card-connected [this callback])
+  (remove-event-listener [this event])
+  (remove-event-listeners [this])
+  (get-application-info [this args])
+  (factory-reset [this args])
+  (install-applet [this args])
+  (install-cash-applet [this args])
+  (init-card [this args])
+  (install-applet-and-init-card [this args])
+  (pair [this args])
+  (generate-and-load-key [this args])
+  (unblock-pin [this args])
+  (verify-pin [this args])
+  (change-pin [this args])
+  (change-puk [this args])
+  (change-pairing [this args])
+  (unpair [this args])
+  (delete [this args])
+  (remove-key [this args])
+  (remove-key-with-unpair [this args])
+  (export-key [this args])
+  (unpair-and-delete [this args])
+  (import-keys [this args])
+  (get-keys [this args])
+  (sign [this args])
+  (sign-typed-data [this args]))

src/keycard/real_keycard.cljs

@@ -0,0 +1,365 @@
+(ns keycard.real-keycard
+  (:require
+    ["react-native" :as rn]
+    ["react-native-status-keycard" :default status-keycard]
+    [keycard.keycard :as keycard]
+    [react-native.platform :as platform]
+    [taoensso.timbre :as log]
+    [utils.address :as address]))
+
+(defonce event-emitter
+  (if platform/ios?
+    (new (.-NativeEventEmitter rn) status-keycard)
+    (.-DeviceEventEmitter rn)))
+
+(defonce active-listeners (atom []))
+
+(defn start-nfc
+  [{:keys [on-success on-failure prompt-message]}]
+  (log/debug "start-nfc")
+  (.. status-keycard
+      (startNFC (str prompt-message))
+      (then on-success)
+      (catch on-failure)))
+
+(defn stop-nfc
+  [{:keys [on-success on-failure error-message]}]
+  (log/debug "stop-nfc")
+  (.. status-keycard
+      (stopNFC (str error-message))
+      (then on-success)
+      (catch on-failure)))
+
+(defn set-nfc-message
+  [{:keys [on-success on-failure status-message]}]
+  (log/debug "set-nfc-message")
+  (.. status-keycard
+      (setNFCMessage (str status-message))
+      (then on-success)
+      (catch on-failure)))
+
+(defn check-nfc-support
+  [{:keys [on-success]}]
+  (.. status-keycard
+      nfcIsSupported
+      (then on-success)))
+
+(defn check-nfc-enabled
+  [{:keys [on-success]}]
+  (.. status-keycard
+      nfcIsEnabled
+      (then on-success)))
+
+(defn open-nfc-settings
+  []
+  (.openNfcSettings status-keycard))
+
+(defn remove-event-listeners
+  []
+  (doseq [event ["keyCardOnConnected" "keyCardOnDisconnected" "keyCardOnNFCUserCancelled"
+                 "keyCardOnNFCTimeout"]]
+    (.removeAllListeners ^js event-emitter event)))
+
+(defn remove-event-listener
+  [^js event]
+  (.remove event))
+
+(defn on-card-connected
+  [callback]
+  (.addListener ^js event-emitter "keyCardOnConnected" callback))
+
+(defn on-card-disconnected
+  [callback]
+  (.addListener ^js event-emitter "keyCardOnDisconnected" callback))
+
+(defn on-nfc-user-cancelled
+  [callback]
+  (.addListener ^js event-emitter "keyCardOnNFCUserCancelled" callback))
+
+(defn on-nfc-timeout
+  [callback]
+  (.addListener ^js event-emitter "keyCardOnNFCTimeout" callback))
+
+(defn on-nfc-enabled
+  [callback]
+  (.addListener ^js event-emitter "keyCardOnNFCEnabled" callback))
+
+(defn on-nfc-disabled
+  [callback]
+  (.addListener ^js event-emitter "keyCardOnNFCDisabled" callback))
+
+(defn set-pairings
+  [{:keys [pairings]}]
+  (.. status-keycard (setPairings (clj->js (or pairings {})))))
+
+(defn register-card-events
+  [args]
+  (doseq [listener @active-listeners]
+    (remove-event-listener listener))
+  (reset! active-listeners
+    [(on-card-connected (:on-card-connected args))
+     (on-card-disconnected (:on-card-disconnected args))
+     (on-nfc-user-cancelled (:on-nfc-user-cancelled args))
+     (on-nfc-timeout (:on-nfc-timeout args))
+     (on-nfc-enabled (:on-nfc-enabled args))
+     (on-nfc-disabled (:on-nfc-disabled args))]))
+
+(defn get-application-info
+  [{:keys [on-success on-failure]}]
+
+  (.. status-keycard
+      (getApplicationInfo)
+      (then (fn [response]
+              (let [info (-> response
+                             (js->clj :keywordize-keys true)
+                             (update :key-uid address/normalized-hex))]
+                (on-success info))))
+      (catch on-failure)))
+
+(defn factory-reset
+  [{:keys [on-success on-failure]}]
+  (.. status-keycard
+      (factoryReset)
+      (then (fn [response]
+              (let [info (-> response
+                             (js->clj :keywordize-keys true)
+                             (update :key-uid address/normalized-hex))]
+                (on-success info))))
+      (catch on-failure)))
+
+(defn install-applet
+  [{:keys [on-success on-failure]}]
+  (.. status-keycard
+      installApplet
+      (then on-success)
+      (catch on-failure)))
+
+(defn install-cash-applet
+  [{:keys [on-success on-failure]}]
+  (.. status-keycard
+      installCashApplet
+      (then on-success)
+      (catch on-failure)))
+
+(defn init-card
+  [{:keys [pin on-success on-failure]}]
+  (.. status-keycard
+      (init pin)
+      (then on-success)
+      (catch on-failure)))
+
+(defn install-applet-and-init-card
+  [{:keys [pin on-success on-failure]}]
+  (.. status-keycard
+      (installAppletAndInitCard pin)
+      (then on-success)
+      (catch on-failure)))
+
+(defn pair
+  [{:keys [password on-success on-failure]}]
+  (when password
+    (.. status-keycard
+        (pair password)
+        (then on-success)
+        (catch on-failure))))
+
+(defn generate-and-load-key
+  [{:keys [mnemonic pin on-success on-failure]}]
+  (.. status-keycard
+      (generateAndLoadKey mnemonic pin)
+      (then on-success)
+      (catch on-failure)))
+
+(defn unblock-pin
+  [{:keys [puk new-pin on-success on-failure]}]
+  (when (and new-pin puk)
+    (.. status-keycard
+        (unblockPin puk new-pin)
+        (then on-success)
+        (catch on-failure))))
+
+(defn verify-pin
+  [{:keys [pin on-success on-failure]}]
+  (when (not-empty pin)
+    (.. status-keycard
+        (verifyPin pin)
+        (then on-success)
+        (catch on-failure))))
+
+(defn change-pin
+  [{:keys [current-pin new-pin on-success on-failure]}]
+  (when (and current-pin new-pin)
+    (.. status-keycard
+        (changePin current-pin new-pin)
+        (then on-success)
+        (catch on-failure))))
+
+(defn change-puk
+  [{:keys [pin puk on-success on-failure]}]
+  (when (and pin puk)
+    (.. status-keycard
+        (changePUK pin puk)
+        (then on-success)
+        (catch on-failure))))
+
+(defn change-pairing
+  [{:keys [pin pairing on-success on-failure]}]
+  (when (and pin pairing)
+    (.. status-keycard
+        (changePairingPassword pin pairing)
+        (then on-success)
+        (catch on-failure))))
+
+(defn unpair
+  [{:keys [pin on-success on-failure]}]
+  (when pin
+    (.. status-keycard
+        (unpair pin)
+        (then on-success)
+        (catch on-failure))))
+
+(defn delete
+  [{:keys [on-success on-failure]}]
+  (.. status-keycard
+      (delete)
+      (then on-success)
+      (catch on-failure)))
+
+(defn remove-key
+  [{:keys [pin on-success on-failure]}]
+  (.. status-keycard
+      (removeKey pin)
+      (then on-success)
+      (catch on-failure)))
+
+(defn remove-key-with-unpair
+  [{:keys [pin on-success on-failure]}]
+  (.. status-keycard
+      (removeKeyWithUnpair pin)
+      (then on-success)
+      (catch on-failure)))
+
+(defn export-key
+  [{:keys [pin path on-success on-failure]}]
+  (.. status-keycard
+      (exportKeyWithPath pin path)
+      (then on-success)
+      (catch on-failure)))
+
+(defn unpair-and-delete
+  [{:keys [pin on-success on-failure]}]
+  (when (not-empty pin)
+    (.. status-keycard
+        (unpairAndDelete pin)
+        (then on-success)
+        (catch on-failure))))
+
+(defn import-keys
+  [{:keys [pin on-success on-failure]}]
+  (when (not-empty pin)
+    (.. status-keycard
+        (importKeys pin)
+        (then on-success)
+        (catch on-failure))))
+
+(defn get-keys
+  [{:keys [pin on-success on-failure]}]
+  (when (not-empty pin)
+    (.. status-keycard
+        (getKeys pin)
+        (then on-success)
+        (catch on-failure))))
+
+(defn sign
+  [{pin :pin path :path card-hash :hash on-success :on-success on-failure :on-failure}]
+  (when (and pin card-hash)
+    (if path
+      (.. status-keycard
+          (signWithPath pin path card-hash)
+          (then on-success)
+          (catch on-failure))
+      (.. status-keycard
+          (sign pin card-hash)
+          (then on-success)
+          (catch on-failure)))))
+
+(defn sign-typed-data
+  [{card-hash :hash on-success :on-success on-failure :on-failure}]
+  (when card-hash
+    (.. status-keycard
+        (signPinless card-hash)
+        (then on-success)
+        (catch on-failure))))
+
+(defrecord RealKeycard []
+  keycard/Keycard
+    (keycard/start-nfc [_this args]
+      (start-nfc args))
+    (keycard/stop-nfc [_this args]
+      (stop-nfc args))
+    (keycard/set-nfc-message [_this args]
+      (set-nfc-message args))
+    (keycard/check-nfc-support [_this args]
+      (check-nfc-support args))
+    (keycard/check-nfc-enabled [_this args]
+      (check-nfc-enabled args))
+    (keycard/open-nfc-settings [_this]
+      (open-nfc-settings))
+    (keycard/register-card-events [_this args]
+      (register-card-events args))
+    (keycard/on-card-connected [_this callback]
+      (on-card-connected callback))
+    (keycard/on-card-disconnected [_this callback]
+      (on-card-disconnected callback))
+    (keycard/remove-event-listener [_this event]
+      (remove-event-listener event))
+    (keycard/remove-event-listeners [_this]
+      (remove-event-listeners))
+    (keycard/set-pairings [_this args]
+      (set-pairings args))
+    (keycard/get-application-info [_this args]
+      (get-application-info args))
+    (keycard/factory-reset [_this args]
+      (factory-reset args))
+    (keycard/install-applet [_this args]
+      (install-applet args))
+    (keycard/install-cash-applet [_this args]
+      (install-cash-applet args))
+    (keycard/init-card [_this args]
+      (init-card args))
+    (keycard/install-applet-and-init-card [_this args]
+      (install-applet-and-init-card args))
+    (keycard/pair [_this args]
+      (pair args))
+    (keycard/generate-and-load-key [_this args]
+      (generate-and-load-key args))
+    (keycard/unblock-pin [_this args]
+      (unblock-pin args))
+    (keycard/verify-pin [_this args]
+      (verify-pin args))
+    (keycard/change-pin [_this args]
+      (change-pin args))
+    (keycard/change-puk [_this args]
+      (change-puk args))
+    (keycard/change-pairing [_this args]
+      (change-pairing args))
+    (keycard/unpair [_this args]
+      (unpair args))
+    (keycard/delete [_this args]
+      (delete args))
+    (keycard/remove-key [_this args]
+      (remove-key args))
+    (keycard/remove-key-with-unpair [_this args]
+      (remove-key-with-unpair args))
+    (keycard/export-key [_this args]
+      (export-key args))
+    (keycard/unpair-and-delete [_this args]
+      (unpair-and-delete args))
+    (keycard/import-keys [_this args]
+      (import-keys args))
+    (keycard/get-keys [_this args]
+      (get-keys args))
+    (keycard/sign [_this args]
+      (sign args))
+    (keycard/sign-typed-data [_this args]
+      (sign-typed-data args)))

src/legacy/status_im/data_store/chats.cljs

@@ -38,12 +38,10 @@
     :always
     (update :contacts conj (:id member))))
 
-(defn community-chat-id->channel-id [chat-id] (subs chat-id constants/community-id-length))
-
 (defn decode-chat-id
   [chat-id]
   (let [community-id (subs chat-id 0 constants/community-id-length)
-        channel-id   (community-chat-id->channel-id chat-id)]
+        channel-id   (subs chat-id constants/community-id-length)]
     {:community-id community-id
      :channel-id   channel-id}))
 

src/legacy/status_im/data_store/communities.cljs

@@ -1,8 +1,8 @@
 (ns legacy.status-im.data-store.communities
   (:require
     [clojure.set :as set]
-    [status-im.constants :as constants]
-    [utils.transforms :as transforms]))
+    [clojure.walk :as walk]
+    [status-im.constants :as constants]))
 
 (defn <-revealed-accounts-rpc
   [accounts]
@@ -22,26 +22,19 @@
   (reduce #(assoc %1 (key-fn %2) (<-request-to-join-community-rpc %2)) {} requests))
 
 (defn <-chats-rpc
-  "This transformation from RPC is optimized differently because there can be
-  thousands of members in all chats and we don't want to transform them from JS
-  to CLJS because they will only be used to list community members or community
-  chat members."
-  [chats-js]
-  (let [chat-key-fn (fn [k]
-                      (case k
-                        "tokenGated"              :token-gated?
-                        "canPost"                 :can-post?
-                        "can-view"                :can-view?
-                        "hideIfPermissionsNotMet" :hide-if-permissions-not-met?
-                        (keyword k)))
-        chat-val-fn (fn [k v]
-                      (if (= "members" k)
-                        v
-                        (transforms/js->clj v)))]
-    (transforms/<-js-map
-     chats-js
-     {:val-fn (fn [_ v]
-                (transforms/<-js-map v {:key-fn chat-key-fn :val-fn chat-val-fn}))})))
+  [chats]
+  (reduce-kv (fn [acc k v]
+               (assoc acc
+                      (name k)
+                      (-> v
+                          (assoc :token-gated?                 (:tokenGated v)
+                                 :can-post?                    (:canPost v)
+                                 :can-view?                    (:canView v)
+                                 :hide-if-permissions-not-met? (:hideIfPermissionsNotMet v))
+                          (dissoc :canPost :tokenGated :canView :hideIfPermissionsNotMet)
+                          (update :members walk/stringify-keys))))
+             {}
+             chats))
 
 (defn <-categories-rpc
   [categ]
@@ -55,59 +48,49 @@
   [token-permission]
   (= (:type token-permission) constants/community-token-permission-become-member))
 
-(defn- rename-community-key
-  [k]
-  (case k
-    "canRequestAccess"            :can-request-access?
-    "canManageUsers"              :can-manage-users?
-    "canDeleteMessageForEveryone" :can-delete-message-for-everyone?
-    ;; This flag is misleading based on its name alone
-    ;; because it should not be used to decide if the user
-    ;; is *allowed* to join. Allowance is based on token
-    ;; permissions. Still, the flag can be used to know
-    ;; whether or not the user will have to wait until an
-    ;; admin approves a join request.
-    "canJoin"                     :can-join?
-    "requestedToJoinAt"           :requested-to-join-at
-    "isMember"                    :is-member?
-    "outroMessage"                :outro-message
-    "adminSettings"               :admin-settings
-    "tokenPermissions"            :token-permissions
-    "communityTokensMetadata"     :tokens-metadata
-    "introMessage"                :intro-message
-    "muteTill"                    :muted-till
-    "lastOpenedAt"                :last-opened-at
-    "joinedAt"                    :joined-at
-    (keyword k)))
-
 (defn <-rpc
-  [c-js]
-  (let [community (transforms/<-js-map
-                   c-js
-                   {:key-fn rename-community-key
-                    :val-fn (fn [k v]
-                              (case k
-                                "members" v
-                                "chats"   (<-chats-rpc v)
-                                (transforms/js->clj v)))})]
-    (-> community
-        (update :admin-settings
-                set/rename-keys
-                {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
-        (update :token-permissions seq)
-        (update :categories <-categories-rpc)
-        (assoc :role-permissions?
-               (->> community
-                    :token-permissions
-                    vals
-                    (some role-permission?)))
-        (assoc :membership-permissions?
-               (->> community
-                    :token-permissions
-                    vals
-                    (some membership-permission?)))
-        (assoc :token-images
-               (reduce (fn [acc {sym :symbol image :image}]
-                         (assoc acc sym image))
-                       {}
-                       (:tokens-metadata community))))))
+  [c]
+  (-> c
+      (set/rename-keys
+       {:canRequestAccess            :can-request-access?
+        :canManageUsers              :can-manage-users?
+        :canDeleteMessageForEveryone :can-delete-message-for-everyone?
+        ;; This flag is misleading based on its name alone
+        ;; because it should not be used to decide if the user
+        ;; is *allowed* to join. Allowance is based on token
+        ;; permissions. Still, the flag can be used to know
+        ;; whether or not the user will have to wait until an
+        ;; admin approves a join request.
+        :canJoin                     :can-join?
+        :requestedToJoinAt           :requested-to-join-at
+        :isMember                    :is-member?
+        :outroMessage                :outro-message
+        :adminSettings               :admin-settings
+        :tokenPermissions            :token-permissions
+        :communityTokensMetadata     :tokens-metadata
+        :introMessage                :intro-message
+        :muteTill                    :muted-till
+        :lastOpenedAt                :last-opened-at
+        :joinedAt                    :joined-at})
+      (update :admin-settings
+              set/rename-keys
+              {:pinMessageAllMembersEnabled :pin-message-all-members-enabled?})
+      (update :members walk/stringify-keys)
+      (update :chats <-chats-rpc)
+      (update :token-permissions seq)
+      (update :categories <-categories-rpc)
+      (assoc :role-permissions?
+             (->> c
+                  :tokenPermissions
+                  vals
+                  (some role-permission?)))
+      (assoc :membership-permissions?
+             (->> c
+                  :tokenPermissions
+                  vals
+                  (some membership-permission?)))
+      (assoc :token-images
+             (reduce (fn [acc {sym :symbol image :image}]
+                       (assoc acc sym image))
+                     {}
+                     (:communityTokensMetadata c)))))

src/legacy/status_im/events.cljs

@@ -11,10 +11,14 @@
     legacy.status-im.fleet.core
     legacy.status-im.group-chats.core
     legacy.status-im.log-level.core
+    legacy.status-im.mailserver.constants
+    [legacy.status-im.mailserver.core :as mailserver]
+    legacy.status-im.mobile-sync-settings.core
     legacy.status-im.multiaccounts.login.core
     legacy.status-im.multiaccounts.logout.core
     [legacy.status-im.multiaccounts.model :as multiaccounts.model]
     legacy.status-im.multiaccounts.update.core
+    legacy.status-im.network.net-info
     legacy.status-im.pairing.core
     legacy.status-im.profile.core
     legacy.status-im.search.core
@@ -22,6 +26,7 @@
     legacy.status-im.ui.components.invite.events
     [legacy.status-im.ui.components.react :as react]
     legacy.status-im.ui.screens.notifications-settings.events
+    legacy.status-im.ui.screens.privacy-and-security-settings.events
     [legacy.status-im.utils.dimensions :as dimensions]
     legacy.status-im.utils.logging.core
     [legacy.status-im.utils.utils :as utils]
@@ -102,7 +107,9 @@
   (let [current-theme-type (get-in cofx [:db :profile/profile :appearance])]
     (when (and (multiaccounts.model/logged-in? db)
                (= current-theme-type status-im.constants/theme-type-system))
-      {:dispatch [:theme/switch]})))
+      {:profile.settings/switch-theme-fx
+       [(get-in db [:profile/profile :appearance])
+        (:view-id db) true]})))
 
 (defn- on-biometric-auth-fail
   [{:keys [code]}]
@@ -128,8 +135,8 @@
                                  (>= (- now app-in-background-since)
                                      constants/ms-in-bg-for-require-bioauth))]
     (rf/merge cofx
-              {:db                                   (dissoc db :app-in-background-since)
-               :effects.biometric/get-supported-type nil}
+              {:db (dissoc db :app-in-background-since)}
+              (mailserver/process-next-messages-request)
               (when-not new-account?
                 (universal-links/process-stored-event))
               #(when-let [chat-id (:current-chat-id db)]

src/legacy/status_im/mailserver/core.cljs

@@ -0,0 +1,437 @@
+(ns ^{:doc "Mailserver events and API"} legacy.status-im.mailserver.core
+  (:require
+    [clojure.string :as string]
+    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
+    [legacy.status-im.node.core :as node]
+    [legacy.status-im.utils.mobile-sync :as mobile-network-utils]
+    [re-frame.core :as re-frame]
+    [status-im.common.json-rpc.events :as json-rpc]
+    [status-im.navigation.events :as navigation]
+    [taoensso.timbre :as log]
+    [utils.i18n :as i18n]
+    [utils.re-frame :as rf]))
+
+;; How do mailserver work ?
+;;
+;; - We send a request to the mailserver, we are only interested in the
+;; messages since `last-request` up to the last seven days
+;; and the last 24 hours for topics that were just joined
+;; - The mailserver doesn't directly respond to the request and
+;; instead we start receiving messages in the filters for the requested
+;; topics.
+;; - If the mailserver was not ready when we tried for instance to request
+;; the history of a topic after joining a chat, the request will be done
+;; as soon as the mailserver becomes available
+
+
+(defn connected?
+  [db id]
+  (= (:mailserver/current-id db) id))
+
+(defn fetch
+  [db id]
+  (get-in db [:mailserver/mailservers (node/current-fleet-key db) id]))
+
+(defn fetch-current
+  [db]
+  (fetch db (:mailserver/current-id db)))
+
+(defn preferred-mailserver-id
+  [db]
+  (get-in db [:profile/profile :pinned-mailservers (node/current-fleet-key db)]))
+
+(defn connection-error-dismissed
+  [db]
+  (get-in db [:mailserver/connection-error-dismissed]))
+
+(defn mailserver-address->id
+  [db address]
+  (let [current-fleet (node/current-fleet-key db)]
+    (:id (some #(when (= address (:address %))
+                  %)
+               (-> db
+                   :mailserver/mailservers
+                   current-fleet
+                   vals)))))
+
+(rf/defn disconnect-from-mailserver
+  {:events [::disconnect-from-mailserver]}
+  [{:keys [db] :as cofx}]
+  {:db (-> db
+           (assoc :mailserver/state nil)
+           (dissoc :mailserver/current-request :mailserver/fetching-gaps-in-progress))})
+
+(defn fetch-use-mailservers?
+  [db]
+  (get-in db [:profile/profile :use-mailservers?]))
+
+(defonce showing-connection-error-popup? (atom false))
+
+(defn cancel-connection-popup!
+  []
+  (reset! showing-connection-error-popup? false)
+  (re-frame/dispatch [:mailserver.ui/dismiss-connection-error true]))
+
+(re-frame/reg-fx
+ ::cancel-connection-popup
+ cancel-connection-popup!)
+
+(rf/defn show-connection-error!
+  [cofx current-fleet preferred-mailserver]
+  (reset! showing-connection-error-popup? true)
+  {:ui/show-confirmation
+   {:title               (i18n/label :t/mailserver-error-title)
+    :content             (i18n/label :t/mailserver-error-content)
+    :confirm-button-text (i18n/label :t/mailserver-pick-another)
+    :on-cancel           cancel-connection-popup!
+    :on-accept           #(do
+                            (reset! showing-connection-error-popup? false)
+                            (re-frame/dispatch [:mailserver.ui/dismiss-connection-error true])
+                            (re-frame/dispatch [:navigate-to :offline-messaging-settings]))
+    :extra-options       [{:text    (i18n/label :t/mailserver-retry)
+                           :onPress #(do
+                                       (reset! showing-connection-error-popup? false)
+                                       (re-frame/dispatch
+                                        [:mailserver.ui/connect-confirmed
+                                         current-fleet
+                                         preferred-mailserver]))
+                           :style   "default"}]}})
+
+(rf/defn handle-successful-request
+  {:events [::request-success]}
+  [{:keys [db] :as cofx} response-js]
+  {:db       (dissoc db :mailserver/current-request)
+   :dispatch [:sanitize-messages-and-process-response response-js]})
+
+(rf/defn handle-mailserver-not-working
+  [{:keys [db] :as cofx}]
+  (let [current-fleet     (node/current-fleet-key db)
+        error-dismissed?  (connection-error-dismissed db)
+        pinned-mailserver (get-in db [:profile/profile :pinned-mailservers current-fleet])]
+    (when (and pinned-mailserver
+               (not error-dismissed?)
+               (not @showing-connection-error-popup?))
+      (show-connection-error! cofx current-fleet pinned-mailserver))))
+
+(rf/defn handle-request-error
+  {:events [::request-error]}
+  [{:keys [db] :as cofx}]
+  {:db (dissoc db :mailserver/current-request)})
+
+(defn needs-to-fetch-historic-messages?
+  [db]
+  (and
+   (:messenger/started? db)
+   (mobile-network-utils/syncing-allowed? db)
+   (fetch-use-mailservers? db)
+   (not (:mailserver/current-request db))))
+
+(rf/defn process-next-messages-request
+  {:events [::request-messages]}
+  [{:keys [db]}]
+  (when (needs-to-fetch-historic-messages? db)
+    {:db                                       (assoc db :mailserver/current-request true)
+     :mailserver/request-all-historic-messages nil}))
+
+(re-frame/reg-fx :mailserver/request-all-historic-messages
+ (fn []
+   (json-rpc/call {:method      "wakuext_requestAllHistoricMessagesWithRetries"
+                   :params      [false]
+                   :js-response true
+                   :on-success  #(do
+                                   (log/info "fetched historical messages")
+                                   (re-frame/dispatch [::request-success %]))
+                   :on-error    #(do
+                                   (log/error "failed retrieve historical messages" %)
+                                   (re-frame/dispatch [::request-error]))})))
+
+(rf/defn handle-mailserver-changed
+  [{:keys [db] :as cofx} ms]
+  (if (seq ms)
+    {:db (assoc db
+                :mailserver/state      :connecting
+                :mailserver/current-id (keyword ms))}
+    {:db (assoc db :mailserver/state nil)}))
+
+(rf/defn handle-mailserver-available
+  [{:keys [db] :as cofx} ms]
+  {::cancel-connection-popup []
+   :db                       (assoc db
+                                    :mailserver/state      :connected
+                                    :mailserver/current-id (keyword ms))})
+
+(rf/defn connected-to-mailserver
+  [{:keys [db] :as cofx}]
+  (let [{:keys [address]} (fetch-current db)]
+    (rf/merge
+     cofx
+     {:mailserver/update-mailservers [[address] #(re-frame/dispatch [::request-messages])]})))
+
+(rf/defn handle-request-success
+  {:events [:mailserver.callback/request-success]}
+  [{{:keys [chats] :as db} :db} {:keys [request-id topics]}]
+  (when (:mailserver/current-request db)
+    {:db (assoc-in db
+          [:mailserver/current-request :request-id]
+          request-id)}))
+
+(rf/defn toggle-use-mailservers
+  [cofx value]
+  {:json-rpc/call
+   [{:method     "wakuext_toggleUseMailservers"
+     :params     [value]
+     :on-success #(log/info "successfully toggled use-mailservers" value)
+     :on-failure #(log/error "failed to toggle use-mailserver" value %)}]})
+
+(rf/defn update-use-mailservers
+  {:events [:mailserver.ui/use-history-switch-pressed]}
+  [cofx use-mailservers?]
+  (rf/merge cofx
+            (multiaccounts.update/optimistic :use-mailservers? use-mailservers?)
+            (toggle-use-mailservers use-mailservers?)
+            (when use-mailservers?
+              (disconnect-from-mailserver))))
+
+(rf/defn retry-next-messages-request
+  {:events [:mailserver.ui/retry-request-pressed]}
+  [{:keys [db] :as cofx}]
+  (rf/merge cofx
+            {:db (dissoc db :mailserver/request-error)}
+            (process-next-messages-request)))
+
+(rf/defn show-request-error-popup
+  {:events [:mailserver.ui/request-error-pressed]}
+  [{:keys [db]}]
+  (let [mailserver-error (:mailserver/request-error db)]
+    {:effects.utils/show-confirmation
+     {:title               (i18n/label :t/mailserver-request-error-title)
+      :content             (i18n/label :t/mailserver-request-error-content
+                                       {:error mailserver-error})
+      :on-accept           #(re-frame/dispatch [:mailserver.ui/retry-request-pressed])
+      :confirm-button-text (i18n/label :t/mailserver-request-retry)}}))
+
+(def enode-url-regex
+  #"enode://[a-zA-Z0-9]+\@\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b:(\d{1,5})")
+
+(defn- extract-url-components
+  [address]
+  (rest (re-matches #"enode://(.*)@(.*)" address)))
+
+(defn valid-enode-url?
+  [address]
+  (re-matches enode-url-regex address))
+
+(defn build-url
+  [address]
+  (let [[initial host] (extract-url-components address)]
+    (str "enode://" initial "@" host)))
+
+(rf/defn set-input
+  {:events [:mailserver.ui/input-changed]}
+  [{:keys [db]} input-key value]
+  {:db (update
+        db
+        :mailserver.edit/mailserver
+        assoc
+        input-key
+        {:value value
+         :error (case input-key
+                  :id   false
+                  :name (string/blank? value)
+                  :url  (not (valid-enode-url? value)))})})
+
+(defn- address->mailserver
+  [address]
+  (let [[enode url :as response] (extract-url-components address)]
+    {:address (if (seq response)
+                (str "enode://" enode "@" url)
+                address)
+     :custom  true}))
+
+(defn- build
+  [id mailserver-name address]
+  (assoc (address->mailserver address)
+         :id   id
+         :name mailserver-name))
+
+(def default? (comp not :custom fetch))
+
+(rf/defn edit
+  {:events [:mailserver.ui/custom-mailserver-selected]}
+  [{:keys [db] :as cofx} id]
+  (let [{:keys [id address name]} (fetch db id)
+        url                       (when address (build-url address))]
+    (rf/merge cofx
+              (set-input :id id)
+              (set-input :url (str url))
+              (set-input :name (str name))
+              (navigation/navigate-to :edit-mailserver nil))))
+
+(defn mailserver->rpc
+  [mailserver current-fleet]
+  (-> mailserver
+      (assoc :fleet (name current-fleet))
+      (update :id name)))
+
+(rf/defn upsert
+  {:events       [:mailserver.ui/save-pressed]
+   :interceptors [(re-frame/inject-cofx :random-id-generator)]}
+  [{{:mailserver.edit/keys [mailserver] :profile/keys [profile] :as db} :db
+    random-id-generator                                                 :random-id-generator
+    :as                                                                 cofx}]
+
+  (let [{:keys [name url id]} mailserver
+        current-fleet         (node/current-fleet-key db)]
+    (when (and (not (string/blank? (:value name)))
+               (valid-enode-url? (:value url)))
+
+      (let [mailserver (build
+                        (or (:value id)
+                            (keyword (string/replace (random-id-generator) "-" "")))
+                        (:value name)
+                        (:value url))
+            current    (connected? db (:id mailserver))]
+        {:db (-> db
+                 (dissoc :mailserver.edit/mailserver)
+                 (assoc-in [:mailserver/mailservers current-fleet (:id mailserver)]
+                           mailserver))
+         :json-rpc/call
+         [{:method     "mailservers_addMailserver"
+           :params     [(mailserver->rpc mailserver current-fleet)]
+           :on-success (fn []
+                         ;; we naively logout if the user is connected to the edited mailserver
+                         (when current
+                           (re-frame/dispatch
+                            [:multiaccounts.logout.ui/logout-confirmed]))
+                         (log/debug "saved mailserver" id "successfuly"))
+           :on-failure #(log/error "failed to save mailserver" id %)}]
+         :dispatch [:navigate-back]}))))
+
+(defn can-delete?
+  [db id]
+  (not (or (default? db id)
+           (connected? db id))))
+
+(rf/defn delete
+  {:events [:mailserver.ui/delete-confirmed]}
+  [{:keys [db] :as cofx} id]
+  (if (can-delete? db id)
+    {:db (-> db
+             (update-in
+              [:mailserver/mailservers (node/current-fleet-key db)]
+              dissoc
+              id)
+             (dissoc :mailserver.edit/mailserver))
+     :json-rpc/call
+     [{:method     "mailservers_deleteMailserver"
+       :params     [(name id)]
+       :on-success #(log/debug "deleted mailserver" id)
+       :on-failure #(log/error "failed to delete mailserver" id %)}]
+     :dispatch [:navigate-back]}
+    {:dispatch [:navigate-back]}))
+
+(rf/defn show-connection-confirmation
+  {:events [:mailserver.ui/default-mailserver-selected :mailserver.ui/connect-pressed]}
+  [{:keys [db]} mailserver-id]
+  (let [current-fleet (node/current-fleet-key db)]
+    {:ui/show-confirmation
+     {:title (i18n/label :t/close-app-title)
+      :content
+      (i18n/label :t/connect-mailserver-content
+                  {:name (get-in db
+                                 [:mailserver/mailservers
+                                  current-fleet mailserver-id :name])})
+      :confirm-button-text (i18n/label :t/close-app-button)
+      :on-accept
+      #(re-frame/dispatch
+        [:mailserver.ui/connect-confirmed current-fleet mailserver-id])
+      :on-cancel nil}}))
+
+(rf/defn show-delete-confirmation
+  {:events [:mailserver.ui/delete-pressed]}
+  [{:keys [db]} mailserver-id]
+  {:ui/show-confirmation
+   {:title               (i18n/label :t/delete-mailserver-title)
+    :content             (i18n/label :t/delete-mailserver-are-you-sure)
+    :confirm-button-text (i18n/label :t/delete-mailserver)
+    :on-accept           #(re-frame/dispatch
+                           [:mailserver.ui/delete-confirmed mailserver-id])}})
+
+(rf/defn set-url-from-qr
+  {:events [:mailserver.callback/qr-code-scanned]}
+  [cofx url]
+  (assoc (set-input cofx :url url)
+         :dispatch
+         [:navigate-back]))
+
+(rf/defn dismiss-connection-error
+  {:events [:mailserver.ui/dismiss-connection-error]}
+  [{:keys [db]} new-state]
+  {:db (assoc db :mailserver/connection-error-dismissed new-state)})
+
+(rf/defn pin-mailserver
+  {:events [:mailserver.ui/connect-confirmed]}
+  [{:keys [db] :as cofx} current-fleet mailserver-id]
+  (let [pinned-mailservers (-> db
+                               (get-in [:profile/profile :pinned-mailservers])
+                               (assoc current-fleet mailserver-id))]
+    (rf/merge cofx
+              {:db            (assoc db :mailserver/current-id mailserver-id)
+               :json-rpc/call [{:method     "wakuext_setPinnedMailservers"
+                                :params     [pinned-mailservers]
+                                :on-success #(log/info "successfully pinned mailserver")
+                                :on-error   #(log/error "failed to pin mailserver" %)}]}
+              (multiaccounts.update/optimistic :pinned-mailservers pinned-mailservers))))
+
+(rf/defn unpin
+  {:events [:mailserver.ui/unpin-pressed]}
+  [{:keys [db] :as cofx}]
+  (let [current-fleet      (node/current-fleet-key db)
+        pinned-mailservers (-> db
+                               (get-in [:profile/profile :pinned-mailservers])
+                               (dissoc current-fleet))]
+    (rf/merge cofx
+              {:json-rpc/call [{:method     "wakuext_setPinnedMailservers"
+                                :params     [pinned-mailservers]
+                                :on-success #(log/info "successfully unpinned mailserver")
+                                :on-error   #(log/error "failed to unpin mailserver" %)}]}
+              (multiaccounts.update/optimistic
+               :pinned-mailservers
+               pinned-mailservers)
+              (dismiss-connection-error false))))
+
+(rf/defn pin
+  {:events [:mailserver.ui/pin-pressed]}
+  [{:keys [db] :as cofx}]
+  (let [current-fleet      (node/current-fleet-key db)
+        mailserver-id      (:mailserver/current-id db)
+        pinned-mailservers (get-in db [:profile/profile :pinned-mailservers])]
+    (rf/merge cofx
+              (multiaccounts.update/multiaccount-update
+               :pinned-mailservers
+               (assoc pinned-mailservers
+                      current-fleet
+                      mailserver-id)
+               {})
+              (dismiss-connection-error false))))
+
+(rf/defn mailserver-ui-add-pressed
+  {:events [:mailserver.ui/add-pressed]}
+  [{:keys [db] :as cofx}]
+  (rf/merge cofx
+            {:db (dissoc db :mailserver.edit/mailserver)}
+            (navigation/navigate-to :edit-mailserver nil)))
+
+(defn add-mailservers
+  [db mailservers]
+  (reduce (fn [db {:keys [fleet id name] :as mailserver}]
+            (let [updated-mailserver
+                  (-> mailserver
+                      (update :id keyword)
+                      (assoc :name (if (seq name) name id))
+                      (dissoc :fleet))]
+              (assoc-in db
+               [:mailserver/mailservers (keyword fleet) (keyword id)]
+               updated-mailserver)))
+          db
+          mailservers))

src/legacy/status_im/mobile_sync_settings/core.cljs

@@ -0,0 +1,109 @@
+(ns legacy.status-im.mobile-sync-settings.core
+  (:require
+    [legacy.status-im.mailserver.core :as mailserver]
+    [legacy.status-im.multiaccounts.model :as multiaccounts.model]
+    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
+    [legacy.status-im.utils.mobile-sync :as utils]
+    [re-frame.core :as re-frame]
+    [status-im.navigation.events :as navigation]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(rf/defn sheet-defaults
+  [{:keys [db]}]
+  (let [remember-choice? (get-in db [:profile/profile :remember-syncing-choice?])]
+    {:db (assoc db
+                :mobile-network/remember-choice?
+                (or (nil? remember-choice?)
+                    remember-choice?))}))
+
+(re-frame/reg-event-fx :mobile-network/on-network-status-change
+ (fn [{:keys [db]}]
+   (let [previously-initialized?  (get db :network-status/initialized?)
+         logged-in?               (multiaccounts.model/logged-in? db)
+         fetch-historic-messages? (mailserver/needs-to-fetch-historic-messages? db)]
+     (if logged-in?
+       {:db (cond-> (-> db
+                        (assoc :network-status/initialized? true)
+                        (assoc :bottom-sheet/show? false))
+              fetch-historic-messages?
+              (assoc :mailserver/current-request true))
+        :fx [(when fetch-historic-messages?
+               [:mailserver/request-all-historic-messages])
+             [:dispatch [:hide-bottom-sheet]]
+             (when previously-initialized?
+               (let [new-identity-input (get-in db [:contacts/new-identity :input])]
+                 [:dispatch [:contacts/set-new-identity {:input new-identity-input}]]))]}
+       {:db (assoc db :network-status/initialized? true)}))))
+
+(defn apply-settings
+  ([sync?] (apply-settings sync? :default))
+  ([sync? remember?]
+   (fn [{:keys [db] :as cofx}]
+     (let [network (:network/type db)
+           remember-choice?
+           (if (not= :default remember?)
+             remember?
+             (:mobile-network/remember-choice? db))
+           cellular? (utils/cellular? network)]
+       (log/info "apply mobile network settings"
+                 "sunc?"     sync?
+                 "remember?" remember?
+                 "cellular?" cellular?)
+       (rf/merge
+        cofx
+        (multiaccounts.update/multiaccount-update
+         :syncing-on-mobile-network?
+         (boolean sync?)
+         {})
+        (multiaccounts.update/multiaccount-update
+         :remember-syncing-choice?
+         (boolean remember-choice?)
+         {})
+        (when (and cellular? sync?)
+          (mailserver/process-next-messages-request)))))))
+
+(rf/defn mobile-network-continue-syncing
+  {:events [:mobile-network/continue-syncing]}
+  [cofx]
+  ((apply-settings true) cofx))
+
+(rf/defn mobile-network-stop-syncing
+  {:events [:mobile-network/stop-syncing]}
+  [cofx]
+  ((apply-settings false) cofx))
+
+(rf/defn mobile-network-set-syncing
+  {:events [:mobile-network/set-syncing]}
+  [{:keys [db] :as cofx} syncing?]
+  (let [{:keys [remember-syncing-choice?]} (:profile/profile db)]
+    ((apply-settings syncing? remember-syncing-choice?) cofx)))
+
+(rf/defn mobile-network-ask-on-mobile-network?
+  {:events [:mobile-network/ask-on-mobile-network?]}
+  [{:keys [db] :as cofx} ask?]
+  (let [{:keys [syncing-on-mobile-network?]} (:profile/profile db)]
+    ((apply-settings syncing-on-mobile-network? (not ask?)) cofx)))
+
+(rf/defn mobile-network-restore-defaults
+  {:events [:mobile-network/restore-defaults]}
+  [cofx]
+  ((apply-settings false false) cofx))
+
+(rf/defn mobile-network-remember-choice?
+  {:events [:mobile-network/remember-choice?]}
+  [{:keys [db]} remember-choice?]
+  {:db (assoc db :mobile-network/remember-choice? remember-choice?)})
+
+(rf/defn mobile-network-navigate-to-settings
+  {:events [:mobile-network/navigate-to-settings]}
+  [cofx]
+  (rf/merge
+   cofx
+   (navigation/hide-bottom-sheet)
+   (navigation/navigate-to :mobile-network-settings nil)))
+
+(rf/defn mobile-network-show-offline-sheet
+  {:events [:mobile-network/show-offline-sheet]}
+  [cofx]
+  (navigation/hide-bottom-sheet cofx))

src/legacy/status_im/multiaccounts/logout/core.cljs

@@ -14,12 +14,10 @@
 
 (rf/defn initialize-app-db
   [{{:keys         [keycard initials-avatar-font-file biometrics]
-     :network/keys [type status expensive?]}
+     :network/keys [type]}
     :db}]
   {:db (assoc db/app-db
               :network/type              type
-              :network/status            status
-              :network/expensive?        expensive?
               :initials-avatar-font-file initials-avatar-font-file
               :keycard                   (dissoc keycard :secrets :pin :application-info)
               :biometrics                biometrics
@@ -30,7 +28,7 @@
   [{:keys [db] :as cofx} {:keys [auth-method logout?]}]
   (let [key-uid (get-in db [:profile/profile :key-uid])]
     (rf/merge cofx
-              {:dispatch                               [:init-root :progress]
+              {:set-root                               :progress
                :effects.shell/reset-state              nil
                :hide-popover                           nil
                ::logout                                nil

src/legacy/status_im/multiaccounts/update/core.cljs

@@ -120,3 +120,12 @@
   {:events [:multiaccounts.ui/switch-backup-enabled]}
   [cofx enabled?]
   (multiaccount-update cofx :backup-enabled? enabled? {}))
+
+(rf/defn toggle-opensea-nfts-visibility
+  {:events [::toggle-opensea-nfts-visiblity]}
+  [cofx visible?]
+  (rf/merge cofx
+            {:db       (assoc-in (:db cofx) [:profile/profile :opensea-enabled?] visible?)
+             ;; need to add fully qualified namespace to counter circular deps
+             :dispatch [:legacy.status-im.wallet.core/fetch-collectibles-collection]}
+            (multiaccount-update :opensea-enabled? visible? {})))

src/legacy/status_im/network/core.cljs

@@ -1,4 +1,4 @@
-(ns utils.network.core
+(ns legacy.status-im.network.core
   (:require
     [clojure.string :as string]))
 

src/legacy/status_im/network/core_test.cljs

@@ -1,7 +1,7 @@
-(ns utils.network.core-test
+(ns legacy.status-im.network.core-test
   (:require
     [cljs.test :refer-macros [deftest is testing]]
-    [utils.network.core :as network.core]))
+    [legacy.status-im.network.core :as network.core]))
 
 (deftest valid-rpc-url-test
   (testing "nil?"

src/legacy/status_im/network/net_info.cljs

@@ -0,0 +1,56 @@
+(ns legacy.status-im.network.net-info
+  (:require
+    ["@react-native-community/netinfo" :default net-info]
+    [native-module.core :as native-module]
+    [re-frame.core :as re-frame]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+(rf/defn change-network-status
+  [{:keys [db] :as cofx} is-connected?]
+  (rf/merge cofx
+            {:db (assoc db :network-status (if is-connected? :online :offline))}))
+
+(rf/defn change-network-type
+  [{:keys [db] :as cofx} network-type expensive?]
+  (rf/merge cofx
+            {:db                       (assoc db :network/type network-type)
+             :network/notify-status-go [network-type expensive?]
+             :dispatch                 [:mobile-network/on-network-status-change]}))
+
+(rf/defn handle-network-info-change
+  {:events [::network-info-changed]}
+  [{:keys [db] :as cofx} {:keys [isConnected type details] :as state}]
+  (let [old-network-status  (:network-status db)
+        old-network-type    (:network/type db)
+        connectivity-status (if isConnected :online :offline)
+        status-changed?     (= connectivity-status old-network-status)
+        type-changed?       (= type old-network-type)]
+    (log/debug "[net-info]"
+               "old-network-status"  old-network-status
+               "old-network-type"    old-network-type
+               "connectivity-status" connectivity-status
+               "type"                type
+               "details"             details)
+    (rf/merge cofx
+              (when-not status-changed?
+                (change-network-status isConnected))
+              (when-not type-changed?
+                (change-network-type type (:is-connection-expensive details))))))
+
+(defn add-net-info-listener
+  []
+  (when net-info
+    (.addEventListener ^js net-info
+                       #(re-frame/dispatch [::network-info-changed
+                                            (js->clj % :keywordize-keys true)]))))
+
+(re-frame/reg-fx
+ :network/listen-to-network-info
+ (fn []
+   (add-net-info-listener)))
+
+(re-frame/reg-fx
+ :network/notify-status-go
+ (fn [[network-type expensive?]]
+   (native-module/connection-change network-type expensive?)))

src/legacy/status_im/subs/root.cljs

@@ -15,7 +15,9 @@
 (reg-root-key-sub :visibility-status-updates :visibility-status-updates)
 (reg-root-key-sub :fleets/custom-fleets :custom-fleets)
 (reg-root-key-sub :ui/search :ui/search)
-(reg-root-key-sub :peer-stats/count :peer-stats/count)
+(reg-root-key-sub :network/type :network/type)
+(reg-root-key-sub :network-status :network-status)
+(reg-root-key-sub :peers-count :peers-count)
 (reg-root-key-sub :peers-summary :peers-summary)
 (reg-root-key-sub :web3-node-version :web3-node-version)
 

src/legacy/status_im/ui/components/connectivity/view.cljs

@@ -1,9 +1,14 @@
 (ns legacy.status-im.ui.components.connectivity.view
   (:require
+    [clojure.string :as string]
     [legacy.status-im.ui.components.animation :as animation]
     [legacy.status-im.ui.components.colors :as colors]
-    [legacy.status-im.ui.components.react :as react])
-  (:require-macros [legacy.status-im.utils.views :as views]))
+    [legacy.status-im.ui.components.core :as quo]
+    [legacy.status-im.ui.components.list.item :as list.item]
+    [legacy.status-im.ui.components.react :as react]
+    [re-frame.core :as re-frame]
+    [utils.i18n :as i18n])
+  (:require-macros [legacy.status-im.utils.views :as views :refer [defview letsubs]]))
 
 (defn easing
   [direction n]
@@ -67,3 +72,112 @@
                                           colors/white)
                       :left
                       (* 0.15 parent-width))}]]]))
+
+(defview loading-indicator
+  []
+  (letsubs [fetching?    [:mailserver/fetching?]
+            window-width [:dimensions/window-width]]
+    (when fetching?
+      [loading-indicator-anim window-width])))
+
+(defn hide-sheet-and-dispatch
+  [event]
+  (re-frame/dispatch [:bottom-sheet/hide-old])
+  (re-frame/dispatch event))
+
+(defview connectivity-sheet
+  []
+  (letsubs [{:keys [peers node mobile sync]}     [:connectivity/state]
+            current-mailserver-name              [:mailserver/current-name]
+            peers-count                          [:peers-count]
+            {:keys [syncing-on-mobile-network?]} [:profile/profile]]
+    [:<>
+     [quo/header {:title (i18n/label :t/connection-status) :border-bottom false}]
+     [quo/list-header (i18n/label :t/peer-to-peer)]
+     (if (= peers :offline)
+       [list.item/list-item
+        {:title               (i18n/label :t/not-connected-to-peers)
+         :accessibility-label "not-connected-to-peers"
+         :subtitle            (i18n/label :t/unable-to-send-messages)
+         :subtitle-max-lines  2
+         :theme               :negative
+         :icon                :main-icons/network}]
+       [list.item/list-item
+        {:title               (str (i18n/label :t/connected-to)
+                                   " " peers-count
+                                   " " (string/lower-case (i18n/label :t/peers)))
+         :accessibility-label "connected-to-n-peers"
+         :subtitle            (i18n/label :t/can-send-messages)
+         :subtitle-max-lines  2
+         :theme               :positive
+         :icon                :main-icons/network}])
+     [quo/list-header (i18n/label :t/history-nodes)]
+     (cond
+       (#{:error :offline} node)
+       [list.item/list-item
+        {:title               (i18n/label :t/not-connected-nodes)
+         :accessibility-label "not-connected-nodes"
+         :subtitle            (i18n/label :t/unable-to-fetch)
+         :theme               :negative
+         :icon                :main-icons/mailserver}]
+       (= node :disabled)
+       [list.item/list-item
+        {:title               (i18n/label :t/nodes-disabled)
+         :accessibility-label "nodes-disabled"
+         :subtitle            (i18n/label :t/unable-to-fetch)
+         :disabled            true
+         :icon                :main-icons/mailserver}]
+       (and mobile (not sync))
+       [list.item/list-item
+        {:title               (i18n/label :t/waiting-wi-fi)
+         :accessibility-label "waiting-wi-fi"
+         :subtitle            (i18n/label :t/unable-to-fetch)
+         :disabled            true
+         :icon                :main-icons/mailserver}]
+       (= node :connecting)
+       [list.item/list-item
+        {:title               (i18n/label :t/connecting)
+         :accessibility-label "connecting"
+         :subtitle            (i18n/label :t/unable-to-fetch)
+         :icon                :main-icons/mailserver}]
+       (= node :online)
+       [list.item/list-item
+        {:title               (str (i18n/label :t/connected-to) " " current-mailserver-name)
+         :accessibility-label "connected-to-mailserver"
+         :subtitle            (i18n/label :t/you-can-fetch)
+         :theme               :positive
+         :icon                :main-icons/mailserver}])
+     [list.item/list-item
+      {:title               (i18n/label :t/settings)
+       :accessibility-label "settings"
+       :theme               :accent
+       :on-press            #(hide-sheet-and-dispatch [:navigate-to :legacy-sync-settings])
+       :icon                :main-icons/settings}]
+     (when mobile
+       [:<>
+        [react/view
+         {:margin-vertical  8
+          :background-color colors/gray-lighter
+          :height           36
+          :align-items      :center
+          :justify-content  :center}
+         [react/text {:style {:color colors/gray}} (i18n/label :t/youre-on-mobile-network)]]
+        [list.item/list-item
+         {:title               (i18n/label :t/mobile-network-use-mobile)
+          :accessibility-label "mobile-network-use-mobile"
+          :accessory           :switch
+          :on-press            #(re-frame/dispatch [:mobile-network/set-syncing
+                                                    (not syncing-on-mobile-network?)])
+          :active              syncing-on-mobile-network?}]
+        [react/text {:style {:margin-horizontal 16 :margin-bottom 12 :color colors/gray}}
+         (i18n/label :t/status-mobile-descr)]])]))
+
+(defn get-icon
+  [{:keys [peers node mobile sync]}]
+  (if (or (= peers :offline)
+          (= node :offline)
+          (= node :connecting))
+    :main-icons/offline
+    (if mobile
+      (if sync :main-icons/mobile-sync :main-icons/mobile-sync-off)
+      (when (#{:error :disabled} node) :main-icons/node-offline))))

src/legacy/status_im/ui/components/keyboard_avoid_presentation.cljs

@@ -10,7 +10,7 @@
     (reagent/as-element
      (into [react/keyboard-avoiding-view
             (update props
-                    :keyboard-vertical-offset
+                    :keyboardVerticalOffset
                     +
                     20
                     (if (:ignore-offset props) 44 0))]

src/legacy/status_im/ui/components/react.cljs

@@ -275,7 +275,7 @@
          (merge (when platform/ios? {:behavior :padding})
                 (if (:ignore-offset props)
                   props
-                  (update props :keyboard-vertical-offset + 44 (:status-bar-height @navigation-const))))]
+                  (update props :keyboardVerticalOffset + 44 (:status-bar-height @navigation-const))))]
         children))
 
 (defn keyboard-avoiding-view-new
@@ -284,7 +284,7 @@
          (merge (when platform/ios? {:behavior :padding})
                 (if (:ignore-offset props)
                   props
-                  (update props :keyboard-vertical-offset + 44)))]
+                  (update props :keyboardVerticalOffset + 44)))]
         children))
 
 (defn scroll-view