chore: status-go fix to avoid log flooding in case of DNS failure

wallet(account): disable send and bridge options for assets with a 0 balance (#21033 )
[#20971 ] fix: app crash when collectible max limit is nan (#20992 )
2024-08-13 12:04:18 +05:30 · 2024-08-12 17:26:40 +01:00 · 2024-08-09 21:39:07 +03:30 · 2024-08-09 16:42:49 +02:00 · 2024-08-09 17:20:43 +08:00 · 2024-08-09 00:20:50 +03:00
416 changed files with 13212 additions and 9075 deletions
@@ -74,7 +74,8 @@
                ;; https://github.com/borkdude/clj-kondo/issues/867
                :unresolved-symbol             {:exclude [PersistentPriorityMap.EMPTY
                                                          number
-                                                          legacy.status-im.test-helpers/restore-app-db]}
+                                                          legacy.status-im.test-helpers/restore-app-db
+                                                          (cljs.test/is [match-strict?])]}
                :unresolved-var                {:level :error}
                :unsorted-required-namespaces  {:level :error}
                :unused-alias                  {:level :warning}
@@ -4,7 +4,6 @@ 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
@@ -26,7 +25,6 @@ APN_TOPIC=im.status.ethereum.pr
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
 DELETE_MESSAGE_ENABLED=1
-COLLECTIBLES_ENABLED=1
 COMMANDS_ENABLED=1
 TWO_MINUTES_SYNCING=1
 SWAP_ENABLED=1
@@ -37,3 +35,4 @@ FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 SHOW_NOT_IMPLEMENTED_FEATURES=0
 ENABLE_ALERT_BANNER=0
+FLAG_WALLET_CONNECT_ENABLED=1
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=status.staging
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
@@ -38,3 +38,5 @@ 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
@@ -3,7 +3,6 @@ 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
@@ -37,3 +36,4 @@ LOCAL_PAIRING_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=1
 TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
+FLAG_WALLET_CONNECT_ENABLED=1
@@ -2,7 +2,6 @@ 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
@@ -24,3 +23,4 @@ DELETE_MESSAGE_ENABLED=1
 FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
 ENABLE_ALERT_BANNER=1
+FLAG_WALLET_CONNECT_ENABLED=1
@@ -2,7 +2,6 @@ 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
@@ -18,6 +17,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
@@ -1,10 +1,15 @@
-*
+/*
+
+# Format top-level js files.
 !*.js
-!*/
-*.clj-kondo
-*.shadow-cljs
-modules
-result
-target
-component-spec
-/app
+
+# Ignore all except src/js/**/*.js
+!/src/
+/src/*
+!/src/js
+!/src/js/**/*.js
+
+# Ignore all except translations/en.json
+!/translations/
+/translations/*
+!/translations/en.json
@@ -6,4 +6,8 @@ module.exports = {
  tabWidth: 2,
  trailingComma: 'all',
  useTabs: false,
+
+  // JSON sorting
+  jsonSortOrder: '{ "/.*/": "caseInsensitiveLexical" } ',
+  plugins: ['prettier-plugin-sort-json'],
 };
@@ -215,15 +215,13 @@ 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-release-unsigned.apk
+	@scripts/sign-android.sh result/app-arm64-v8a-release-unsigned.apk

 release-ios: export TARGET := ios
 release-ios: export IOS_STATUS_GO_TARGETS := ios/arm64
@@ -317,7 +315,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 --write .
+	node_modules/.bin/prettier --check .

 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
 lint-fix: export TARGET := clojure
@@ -353,13 +351,17 @@ 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' \
+		"yarn shadow-cljs watch test --verbose --config-merge '{:output-to \"$(SHADOW_OUTPUT_TO)\" :ns-regexp \"$(SHADOW_NS_REGEXP)\"}'" \
 		"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
@@ -434,10 +436,11 @@ android-clean: ##@prepare Clean Gradle state
 	rm -rf ~/.gradle


-android-ports: export FLOWSTORM_PORT := 7722
+android-ports: export FLOWSTORM_PORT ?= 7722
 android-ports: export TARGET := android-sdk
+android-ports: export RCT_METRO_PORT ?= 8081
 android-ports: ##@other Add proxies to Android Device/Simulator
-	adb reverse tcp:8081 tcp:8081 && \
+	adb reverse tcp:$(RCT_METRO_PORT) tcp:$(RCT_METRO_PORT) && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
 	adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \
@@ -457,6 +460,12 @@ 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    :'
@@ -211,7 +211,7 @@ android {
            reset()
            enable getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()
            include getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
-            universalApk true
+            universalApk false
        }
    }
    signingConfigs {
@@ -38,10 +38,10 @@ KEYSTORE_PASSWORD=password
 KEYSTORE_ALIAS=status
 KEYSTORE_KEY_PASSWORD=password

-# 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
+# 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

 org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC

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

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -72,11 +72,7 @@ pipeline {
        stage('Upload') {
          steps { script {
            def urls = apks.collect { s5cmd.upload(it) }
-            if (urls.size() > 1) { /* Return only the universal APK. */
-              env.PKG_URL = urls.find { it.contains('universal') }
-            } else { /* If no universal is available pick first. */
-              env.PKG_URL = urls.first()
-            }
+            env.PKG_URL = urls.first()
            jenkins.setBuildDesc(APK: env.PKG_URL)
          } }
        }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.1'
+library 'status-jenkins-lib@v1.9.4'

 import groovy.json.JsonBuilder

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

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

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

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

 pipeline {

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

 pipeline {

@@ -35,13 +35,11 @@ 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: 'new_ui_critical',
+      defaultValue: 'smoke',
    )
-    */
  }

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

 pipeline {

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

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

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

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

 pipeline {
  agent {
@@ -1,67 +1,43 @@
-## Getting Started 
-
-[Starting Guide](starting-guide.md)
-
-[IDE Setup](ide-setup.md)
-
+## Getting Started

+- [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

-[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)
-
+- [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)

 ## 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)
@@ -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/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/tests/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:
@@ -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.
@@ -0,0 +1,167 @@
+# 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).
@@ -915,7 +915,7 @@ PODS:
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
-  - react-native-compat (2.12.2):
+  - react-native-compat (2.11.2):
    - glog
    - RCT-Folly (= 2022.05.16.00)
    - React-Core
@@ -1517,7 +1517,7 @@ SPEC CHECKSUMS:
  react-native-blob-util: 600972b1782380a5a7d5db61a3817ea32349dae9
  react-native-blur: 799045500f56146afc46245148080e7b7623cb75
  react-native-cameraroll: af8eec1e585d053ff485d98ec837f9a8a11b5745
-  react-native-compat: 84e00e8dcff9251278c0d48f2bce81f4502e3925
+  react-native-compat: 3af9add14d349701306d3d052638435f6795ac2c
  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
  react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06
  react-native-hole-view: 6935448993bac79f2b5a4ad7e9741094cf810679
@@ -246,6 +246,14 @@ 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")
@@ -62,6 +62,11 @@ 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);
@@ -92,6 +97,11 @@ public class EncryptionUtils extends ReactContextBaseJavaModule {
        return Statusgo.hexToUtf8(str);
    }

+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String serializeLegacyKey(final String publicKey) {
+	return Statusgo.serializeLegacyKey(publicKey);
+    }
+
    @ReactMethod
    public void setBlankPreviewFlag(final Boolean blankPreview) {
        final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this.reactContext);
@@ -76,6 +76,16 @@ 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)
@@ -153,4 +153,9 @@ class Utils(private val reactContext: ReactApplicationContext) : ReactContextBas

        return strArray
    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    fun validateConnectionString(connectionString: String): String {
+        return Statusgo.validateConnectionString(connectionString)
+    }
 }
@@ -195,6 +195,15 @@ RCT_EXPORT_METHOD(verifyDatabasePassword:(NSString *)keyUID
    callback(@[result]);
 }

+RCT_EXPORT_METHOD(initializeApplication:(NSString *)request
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"initializeApplication() method called");
+#endif
+    NSString *result = StatusgoInitializeApplication(request);
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(openAccounts:(RCTResponseSenderBlock)callback) {
 #if DEBUG
    NSLog(@"OpenAccounts() method called");
@@ -94,6 +94,10 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(hexToUtf8:(NSString *)str) {
    return StatusgoHexToUtf8(str);
 }

+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(serializeLegacyKey:(NSString *)str) {
+    return StatusgoSerializeLegacyKey(str);
+}
+
 RCT_EXPORT_METHOD(setBlankPreviewFlag:(BOOL *)newValue)
 {
    NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
@@ -176,6 +176,24 @@ RCT_EXPORT_METHOD(appStateChange:(NSString *)type) {
    StatusgoAppStateChange(type);
 }

+RCT_EXPORT_METHOD(addCentralizedMetric:(NSString *)request
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"addCentralizedMetric() method called");
+#endif
+    NSString *result = StatusgoAddCentralizedMetric(request);
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(toggleCentralizedMetrics:(NSString *)request
+                  callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"toggleCentralizedMetrics() method called");
+#endif
+    NSString *result = StatusgoToggleCentralizedMetrics(request);
+    callback(@[result]);
+}
+
 RCT_EXPORT_METHOD(startLocalNotifications) {
 #if DEBUG
    NSLog(@"StartLocalNotifications() method called");
@@ -128,4 +128,8 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(toChecksumAddress:(NSString *)address) {
    return StatusgoToChecksumAddress(address);
 }

+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(validateConnectionString:(NSString *)cs) {
+    return StatusgoValidateConnectionString(cs);
+}
+
@end
@@ -302,6 +302,36 @@ void _MultiAccountStoreAccount(const FunctionCallbackInfo<Value>& args) {
 	delete c;
 }

+void _InitializeApplication(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 1) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for InitializeApplication")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for request")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = InitializeApplication(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+}

 void _InitKeystore(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
@@ -642,6 +672,38 @@ void _Sha3(const FunctionCallbackInfo<Value>& args) {

 }

+void _SerializeLegacyKey(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+        Local<Context> context = isolate->GetCurrentContext();
+
+	if (args.Length() != 1) {
+		// Throw an Error that is passed back to JavaScript
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong number of arguments for SerializeLegacyKey")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'str'")));
+		return;
+	}
+
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = SerializeLegacyKey(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+
+}
+
 void _ToChecksumAddress(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
        Local<Context> context = isolate->GetCurrentContext();
@@ -1935,6 +1997,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreDerivedAccounts", _MultiAccountStoreDerivedAccounts);
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
+	NODE_SET_METHOD(exports, "initializeApplication", _InitializeApplication);
 	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
@@ -1945,6 +2008,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "checkAddressChecksum", _CheckAddressChecksum);
 	NODE_SET_METHOD(exports, "isAddress", _IsAddress);
 	NODE_SET_METHOD(exports, "sha3", _Sha3);
+	NODE_SET_METHOD(exports, "serializeLegacyKey", _SerializeLegacyKey);
 	NODE_SET_METHOD(exports, "toChecksumAddress", _ToChecksumAddress);
 	NODE_SET_METHOD(exports, "logout", _Logout);
 	NODE_SET_METHOD(exports, "hashMessage", _HashMessage);
@@ -1972,7 +2036,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "signTypedData", _SignTypedData);
 	NODE_SET_METHOD(exports, "sendTransaction", _SendTransaction);
 	NODE_SET_METHOD(exports, "appStateChange", _AppStateChange);
-    NODE_SET_METHOD(exports, "setSignalEventCallback", _SetSignalEventCallback);
+        NODE_SET_METHOD(exports, "setSignalEventCallback", _SetSignalEventCallback);
 	NODE_SET_METHOD(exports, "validateNodeConfig", _ValidateNodeConfig);
 	NODE_SET_METHOD(exports, "hashTypedData", _HashTypedData);
 	NODE_SET_METHOD(exports, "recover", _Recover);
@@ -711,11 +711,11 @@
  },

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

@@ -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.8.8/matcher-combinators-3.8.8.jar
+nubank/matcher-combinators/3.9.1/matcher-combinators-3.9.1.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
@@ -45,7 +45,6 @@ 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
@@ -68,7 +67,6 @@ 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
@@ -518,15 +516,7 @@ 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
@@ -553,10 +543,6 @@ 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
@@ -572,11 +558,6 @@ 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
@@ -591,6 +572,7 @@ 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
@@ -87,7 +87,6 @@ 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
@@ -481,26 +480,8 @@ 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
@@ -523,12 +504,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.0/commons-codec-1.17.0.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-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.2/commons-logging-1.3.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/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
@@ -628,22 +609,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.1/jackson-annotations-2.17.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-core/2.11.1/jackson-core-2.11.1.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-core/2.17.2/jackson-core-2.17.2.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.1/jackson-databind-2.17.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/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.1/jackson-base-2.17.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-bom/2.11.1/jackson-bom-2.11.1.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-bom/2.17.2/jackson-bom-2.17.2.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.1/jackson-modules-base-2.17.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-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.1/jackson-module-jaxb-annotations-2.17.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-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
@@ -712,7 +693,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.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.28.0/error_prone_annotations-2.28.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_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
@@ -725,7 +706,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.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.28.0/error_prone_parent-2.28.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/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
@@ -770,7 +751,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.27.0/protobuf-bom-4.27.0.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-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
@@ -787,7 +768,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.27.0/protobuf-java-4.27.0.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-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
@@ -798,9 +779,11 @@ 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.27.0/protobuf-parent-4.27.0.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/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/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
@@ -971,9 +954,11 @@ 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
@@ -1018,6 +1003,7 @@ 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
@@ -1037,6 +1023,7 @@ 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
@@ -1091,7 +1078,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.44.0/checker-qual-3.44.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/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
@@ -1101,21 +1088,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.23/animal-sniffer-annotations-1.23.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-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.23/animal-sniffer-parent-1.23.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/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/74/mojo-parent-74.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/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.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/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/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
@@ -1146,9 +1133,10 @@ 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/2.2/hamcrest-core-2.2.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-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
@@ -1248,7 +1236,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.0/kotlin-reflect-2.0.0.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-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
@@ -1353,7 +1341,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.0/kotlin-stdlib-2.0.0.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-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
@@ -1372,6 +1360,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/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
@@ -1383,8 +1372,10 @@ 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
@@ -17,11 +17,12 @@
  hermesEnabled ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_hermesEnabled" "true",
  buildUrl ? lib.getEnvWithDefault "ORG_GRADLE_PROJECT_buildUrl" null,
  statusGoSrcOverride ? lib.getEnvWithDefault "STATUS_GO_SRC_OVERRIDE" null,
+  reactMetroPort ? lib.getEnvWithDefault "RCT_METRO_PORT" 8081,
  # If APKs should be split based on architectures
-  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "false",
+  androidAbiSplit ? lib.getEnvWithDefault "ANDROID_ABI_SPLIT" "true",
  # Android architectures to build for
  # Used to detect end-to-end builds
-  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "armeabi-v7a;arm64-v8a;x86",
+  androidAbiInclude ? lib.getEnvWithDefault "ANDROID_ABI_INCLUDE" "arm64-v8a",
 }:

 let
@@ -158,6 +159,7 @@ in stdenv.mkDerivation rec {
      --no-build-cache \
      --parallel \
      -Dmaven.repo.local='${deps.gradle}' \
+      -PreactNativeDevServerPort=${toString reactMetroPort} \
      assemble${gradleBuildType}
    '';
  in
@@ -41,7 +41,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": "14.0.0-beta13",
+    "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-config": "^1.5.0",
    "react-native-dialogs": "1.1.2",
    "react-native-draggable-flatlist": "4.0.1",
@@ -97,7 +97,8 @@
    "jest-silent-reporter": "^0.5.0",
    "nodemon": "^2.0.16",
    "nyc": "^14.1.1",
-    "prettier": "^2.8.8",
+    "prettier": "^3.3.3",
+    "prettier-plugin-sort-json": "^4.0.0",
    "process": "0.11.10",
    "react-test-renderer": "18.1.0",
    "shadow-cljs": "2.26.2",
@@ -45,6 +45,8 @@ SECRETS_ENV_VARS=(
    'INFURA_TOKEN'
    'INFURA_TOKEN_SECRET'
    'OPENSEA_API_KEY'
+    'MIXPANEL_APP_ID'
+    'MIXPANEL_TOKEN'
    'POKT_TOKEN'
 )

@@ -6,7 +6,7 @@ if pgrep -f 'shadow-cljs watch mobile' > /dev/null; then
    exit 1
 fi

-if pgrep -f 'react-native start' > /dev/null; then
+if pgrep -f "react-native start --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
    echo "Error: make run-metro is already running in another terminal" >&2
    echo "Please close that terminal before running this command." >&2
    exit 1
@@ -13,7 +13,7 @@ export BUILD_TYPE=debug

 # Install the APK on running emulator or android device.
 installAndLaunchApp() {
-  adb install -r ./result/app-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
+  adb install -r ./result/app-arm64-v8a-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}"
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash

-if pgrep -f 'react-native start' > /dev/null; then
+if pgrep -f "react-native start --port=${RCT_METRO_PORT:-8081}" > /dev/null; then
    echo "Info: metro is already running in another terminal"
 else
    echo "Info: starting a new metro terminal"
-    react-native start --reset-cache
+    react-native start --port=${RCT_METRO_PORT:-8081} --reset-cache
 fi
@@ -4,7 +4,7 @@ set -euo pipefail
 TIMEOUT=10 # Metro should not take this long to start.

 while [ "${TIMEOUT}" -gt 0 ]; do
-  if ! lsof -i:8081 &> /dev/null; then
+  if ! lsof -i:"${RCT_METRO_PORT:-8081}" &> /dev/null; then
    echo "."
    sleep 1
    ((TIMEOUT--))
@@ -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.8.8"]
+                [nubank/matcher-combinators "3.9.1"]

                ;; Use the same version specified in the Nix dependency.
                [clj-kondo/clj-kondo "2024.03.13"]
@@ -67,6 +67,10 @@
         :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"
@@ -101,7 +105,11 @@
   {: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"
@@ -143,6 +151,8 @@
    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"
@@ -1,38 +1,277 @@
-(ns keycard.keycard)
+(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]))

-(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]))
+(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))))
@@ -1,365 +0,0 @@
-(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)))
@@ -1,8 +1,8 @@
 (ns legacy.status-im.data-store.communities
  (:require
    [clojure.set :as set]
-    [clojure.walk :as walk]
-    [status-im.constants :as constants]))
+    [status-im.constants :as constants]
+    [utils.transforms :as transforms]))

 (defn <-revealed-accounts-rpc
  [accounts]
@@ -22,19 +22,26 @@
  (reduce #(assoc %1 (key-fn %2) (<-request-to-join-community-rpc %2)) {} requests))

 (defn <-chats-rpc
-  [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))
+  "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}))})))

 (defn <-categories-rpc
  [categ]
@@ -48,49 +55,59 @@
  [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]
-  (-> 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)))))
+  [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))))))
@@ -11,14 +11,10 @@
    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
@@ -26,7 +22,6 @@
    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]
@@ -107,8 +102,7 @@
  (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))
-      {:profile.settings/switch-theme-fx
-       [(get-in db [:profile/profile :appearance]) (:view-id db)]})))
+      {:dispatch [:theme/switch]})))

 (defn- on-biometric-auth-fail
  [{:keys [code]}]
@@ -136,7 +130,6 @@
    (rf/merge cofx
              {:db                                   (dissoc db :app-in-background-since)
               :effects.biometric/get-supported-type nil}
-              (mailserver/process-next-messages-request)
              (when-not new-account?
                (universal-links/process-stored-event))
              #(when-let [chat-id (:current-chat-id db)]
@@ -1,437 +0,0 @@
-(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))
@@ -1,109 +0,0 @@
-(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))
@@ -14,10 +14,12 @@

 (rf/defn initialize-app-db
  [{{:keys         [keycard initials-avatar-font-file biometrics]
-     :network/keys [type]}
+     :network/keys [type status expensive?]}
    :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
@@ -120,12 +120,3 @@
  {: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? {})))
@@ -1,56 +0,0 @@
-(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?)))
@@ -15,8 +15,6 @@
 (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 :network/type :network/type)
-(reg-root-key-sub :network-status :network-status)
 (reg-root-key-sub :peer-stats/count :peer-stats/count)
 (reg-root-key-sub :peers-summary :peers-summary)
 (reg-root-key-sub :web3-node-version :web3-node-version)
@@ -5,6 +5,7 @@
    [legacy.status-im.ui.components.list.views :as list]
    [quo.core :as quo]
    [re-frame.core :as re-frame]
+    [status-im.feature-flags :as ff]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf])
  (:require-macros [legacy.status-im.utils.views :as views]))
@@ -18,9 +19,8 @@
  [{:keys [current-log-level
           telemetry-enabled?
           light-client-enabled?
+           store-confirmations-enabled?
           current-fleet
-           test-networks-enabled?
-           is-goerli-enabled?
           peer-syncing-enabled?]}]
  (keep
   identity
@@ -60,14 +60,14 @@
     :on-press
     #(re-frame/dispatch [:open-modal :peers-stats])
     :chevron true}
-    {:size :small
-     :title "Telemetry"
-     :accessibility-label :telemetry-enabled
-     :container-margin-bottom 8
-     :on-press
-     #(re-frame/dispatch [:profile.settings/toggle-telemetry])
-     :accessory :switch
-     :active telemetry-enabled?}
+    (when (ff/enabled? ::ff/settings.telemetry)
+      {:size                    :small
+       :title                   "Telemetry"
+       :accessibility-label     :telemetry-enabled
+       :container-margin-bottom 8
+       :on-press                #(re-frame/dispatch [:profile.settings/toggle-telemetry])
+       :accessory               :switch
+       :active                  telemetry-enabled?})
    {:size :small
     :title (i18n/label :t/light-client-enabled)
     :accessibility-label :light-client-enabled
@@ -78,21 +78,14 @@
     :accessory :switch
     :active light-client-enabled?}
    {:size :small
-     :title "Testnet mode"
-     :accessibility-label :test-networks-enabled
+     :title (i18n/label :t/store-confirmations)
+     :accessibility-label :store-confirmations
     :container-margin-bottom 8
     :on-press
-     #(re-frame/dispatch [:profile.settings/toggle-test-networks])
+     #(re-frame/dispatch
+       [:wakuv2.ui/toggle-store-confirmations (not store-confirmations-enabled?)])
     :accessory :switch
-     :active test-networks-enabled?}
-    {:size :small
-     :title "Enable Goerli as test network"
-     :accessibility-label :enable-sepolia-as-test-network
-     :container-margin-bottom 8
-     :on-press
-     #(re-frame/dispatch [:profile.settings/toggle-goerli-test-network])
-     :accessory :switch
-     :active is-goerli-enabled?}
+     :active store-confirmations-enabled?}
    {:size :small
     :title "Peer syncing"
     :accessibility-label :peer-syncing
@@ -114,13 +107,12 @@

 (views/defview advanced-settings
  []
-  (views/letsubs [test-networks-enabled? [:profile/test-networks-enabled?]
-                  is-goerli-enabled?     [:profile/is-goerli-enabled?]
-                  light-client-enabled?  [:profile/light-client-enabled?]
-                  telemetry-enabled?     [:profile/telemetry-enabled?]
-                  current-log-level      [:log-level/current-log-level]
-                  current-fleet          [:fleets/current-fleet]
-                  peer-syncing-enabled?  [:profile/peer-syncing-enabled?]]
+  (views/letsubs [light-client-enabled?        [:profile/light-client-enabled?]
+                  store-confirmations-enabled? [:profile/store-confirmations-enabled?]
+                  telemetry-enabled?           [:profile/telemetry-enabled?]
+                  current-log-level            [:log-level/current-log-level]
+                  current-fleet                [:fleets/current-fleet]
+                  peer-syncing-enabled?        [:profile/peer-syncing-enabled?]]
    [:<>
     [quo/page-nav
      {:type       :title
@@ -130,13 +122,12 @@
       :on-press   #(rf/dispatch [:navigate-back])}]
     [list/flat-list
      {:data      (flat-list-data
-                   {:current-log-level      current-log-level
-                    :telemetry-enabled?     telemetry-enabled?
-                    :light-client-enabled?  light-client-enabled?
-                    :current-fleet          current-fleet
-                    :dev-mode?              false
-                    :test-networks-enabled? test-networks-enabled?
-                    :is-goerli-enabled?     is-goerli-enabled?
-                    :peer-syncing-enabled?  peer-syncing-enabled?})
+                   {:current-log-level            current-log-level
+                    :telemetry-enabled?           telemetry-enabled?
+                    :light-client-enabled?        light-client-enabled?
+                    :store-confirmations-enabled? store-confirmations-enabled?
+                    :current-fleet                current-fleet
+                    :dev-mode?                    false
+                    :peer-syncing-enabled?        peer-syncing-enabled?})
       :key-fn    (fn [_ i] (str i))
       :render-fn render-item}]]))
@@ -127,7 +127,7 @@
         (when (and can-manage-users? (= constants/community-on-request-access (:access permissions)))
           [requests-to-join community-id])
         [rn/flat-list
-          {:data        (keys sorted-members)
+          {:data        sorted-members
           :render-data {:community-id      community-id
                         :my-public-key     my-public-key
                         :can-kick-users?   (and can-manage-users?
@@ -1,11 +0,0 @@
-(ns legacy.status-im.ui.screens.dapps-permissions.styles
-  (:require
-    [legacy.status-im.ui.components.colors :as colors]))
-
-(def icon-container
-  {:width            40
-   :height           40
-   :border-radius    20
-   :background-color colors/gray-lighter
-   :align-items      :center
-   :justify-content  :center})
@@ -1,64 +0,0 @@
-(ns legacy.status-im.ui.screens.dapps-permissions.views
-  (:require-macros [legacy.status-im.utils.views :as views])
-  (:require
-    [legacy.status-im.ui.components.colors :as colors]
-    [legacy.status-im.ui.components.core :as quo]
-    [legacy.status-im.ui.components.icons.icons :as icons]
-    [legacy.status-im.ui.components.list.item :as list.item]
-    [legacy.status-im.ui.components.list.views :as list]
-    [legacy.status-im.ui.components.react :as react]
-    [legacy.status-im.ui.components.topbar :as topbar]
-    [legacy.status-im.ui.screens.dapps-permissions.styles :as styles]
-    [re-frame.core :as re-frame]
-    [status-im.constants :as constants]
-    [utils.i18n :as i18n]))
-
-(defn d-icon
-  []
-  [react/view styles/icon-container
-   [icons/icon :main-icons/dapp {:color colors/gray}]])
-
-(defn prepare-items
-  [{:keys [dapp permissions]}]
-  {:title    dapp
-   :chevron  true
-   :on-press #(re-frame/dispatch [:navigate-to :manage-dapps-permissions
-                                  {:dapp dapp :permissions permissions}])
-   :icon     [d-icon]})
-
-(defn prepare-items-manage
-  [name]
-  (fn [permission]
-    {:title     (cond
-                  (= permission constants/dapp-permission-web3)
-                  name
-                  (= permission constants/dapp-permission-contact-code)
-                  (i18n/label :t/contact-code))
-     :size      :small
-     :accessory [icons/icon :main-icons/check {}]}))
-
-(views/defview dapps-permissions
-  []
-  (views/letsubs [permissions [:dapps/permissions]]
-    [list/flat-list
-     {:data      (vec (map prepare-items (vals permissions)))
-      :key-fn    (fn [_ i] (str i))
-      :render-fn list.item/list-item}]))
-
-(views/defview manage
-  []
-  (views/letsubs [{:keys [dapp permissions]} [:get-screen-params]
-                  {:keys [name]}             [:dapps-account]]
-    [:<>
-     [topbar/topbar {:title dapp}]
-     [list/flat-list
-      {:data      (vec (map (prepare-items-manage name) permissions))
-       :key-fn    (fn [_ i] (str i))
-       :render-fn list.item/list-item}]
-     [react/view
-      {:padding-vertical   16
-       :padding-horizontal 16}
-      [quo/button
-       {:theme    :negative
-        :on-press #(re-frame/dispatch [:dapps/revoke-access dapp])}
-       (i18n/label :t/revoke-access)]]]))
@@ -1,13 +0,0 @@
-(ns legacy.status-im.ui.screens.link-previews-settings.styles)
-
-(def link-preview-settings-image
-  {:height     100
-   :align-self :center
-   :margin-top 16})
-
-(def whitelist-container
-  {:flex-direction  :row
-   :justify-content :space-between})
-
-(def enable-all
-  {:align-self :flex-end})
@@ -1,67 +0,0 @@
-(ns legacy.status-im.ui.screens.link-previews-settings.views
-  (:require-macros [legacy.status-im.utils.views :as views])
-  (:require
-    [legacy.status-im.react-native.resources :as resources]
-    [legacy.status-im.ui.components.core :as components]
-    [legacy.status-im.ui.components.list.item :as list.item]
-    [legacy.status-im.ui.components.list.views :as list]
-    [legacy.status-im.ui.components.react :as react]
-    [legacy.status-im.ui.screens.link-previews-settings.styles :as styles]
-    [quo.core :as quo]
-    [re-frame.core :as re-frame]
-    [status-im.contexts.chat.messenger.messages.link-preview.events]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
-
-(defn prepare-urls-items-data
-  [link-previews-enabled-sites]
-  (fn [{:keys [title address]}]
-    (let [enabled? (contains? link-previews-enabled-sites title)]
-      {:title     title
-       :subtitle  address
-       :size      :small
-       :accessory :switch
-       :active    (contains? link-previews-enabled-sites title)
-       :on-press  #(re-frame/dispatch
-                    [:chat.ui/enable-link-previews title ((complement boolean) enabled?)])})))
-
-(views/defview link-previews-settings
-  []
-  (views/letsubs [link-previews-whitelist     [:link-previews-whitelist]
-                  link-previews-enabled-sites [:link-preview/enabled-sites]]
-    (let [all-enabled (= (count link-previews-whitelist) (count link-previews-enabled-sites))]
-      [:<>
-       [quo/page-nav
-        {:type       :title
-         :title      (i18n/label :t/chat-link-previews)
-         :background :blur
-         :icon-name  :i/close
-         :on-press   #(rf/dispatch [:navigate-back])}]
-       [react/image
-        {:source (resources/get-theme-image :unfurl)
-         :style  styles/link-preview-settings-image}]
-       [components/text {:style {:margin 16}}
-        (i18n/label :t/you-can-choose-preview-websites)]
-       [components/separator {:style {:margin-vertical 8}}]
-
-       [react/view styles/whitelist-container
-        [components/list-header (i18n/label :t/websites)]
-
-        (when (> (count link-previews-whitelist) 1)
-          [components/button
-           {:on-press #(re-frame/dispatch [:chat.ui/enable-all-link-previews
-                                           link-previews-whitelist
-                                           (not all-enabled)])
-            :type     :secondary
-            :style    styles/enable-all}
-           (if all-enabled
-             (i18n/label :t/disable-all)
-             (i18n/label :t/enable-all))])]
-       [list/flat-list
-        {:data      (vec (map (prepare-urls-items-data link-previews-enabled-sites)
-                              link-previews-whitelist))
-         :key-fn    (fn [_ i] (str i))
-         :render-fn list.item/list-item
-         :footer    [quo/text
-                     {:color :secondary
-                      :style {:margin 16}} (i18n/label :t/previewing-may-share-metadata)]}]])))
@@ -1,51 +0,0 @@
-(ns legacy.status-im.ui.screens.mobile-network-settings.sheets
-  (:require-macros [legacy.status-im.utils.views :as views])
-  (:require [legacy.status-im.ui.components.list.item :as list.item]
-            [legacy.status-im.ui.components.react :as react]
-            [legacy.status-im.ui.screens.mobile-network-settings.sheets-styles :as styles]
-            [re-frame.core :as re-frame]
-            [utils.i18n :as i18n]))
-
-(defn title
-  [label]
-  [react/view {:style styles/title}
-   [react/text
-    {:style styles/title-text}
-    (i18n/label label)]])
-
-(defn details
-  [label]
-  [react/view
-   {:style styles/details}
-   [react/text
-    {:style styles/details-text}
-    (i18n/label label)]])
-
-(defn separator
-  []
-  [react/view {:style styles/separator}])
-
-(defn go-to-settings
-  []
-  [react/view
-   {:style styles/go-to-settings-container}
-   [react/text
-    {:style    styles/go-to-settings
-     :on-press #(re-frame/dispatch [:mobile-network/navigate-to-settings])}
-    (i18n/label :t/mobile-network-go-to-settings)]])
-
-(views/defview offline-sheet
-  []
-  [react/view {:flex 1}
-   [react/view {:align-items :center}
-    [title :t/mobile-network-sheet-offline]
-    [details :t/mobile-network-sheet-offline-details]]
-   [list.item/list-item
-    {:theme              :accent
-     :title              (i18n/label :t/mobile-network-start-syncing)
-     :subtitle           (i18n/label :t/mobile-network-continue-syncing-details)
-     :subtitle-max-lines 2
-     :icon               :main-icons/network
-     :on-press           #(re-frame/dispatch [:mobile-network/continue-syncing])}]
-   [separator]
-   [go-to-settings]])
@@ -1,73 +0,0 @@
-(ns legacy.status-im.ui.screens.mobile-network-settings.sheets-styles
-  (:require
-    [legacy.status-im.ui.components.colors :as colors]))
-
-(def title
-  {:height     21
-   :margin-top 8})
-
-(def title-text
-  {:typography :title-bold})
-
-(def details
-  {:width         311
-   :margin-left   32
-   :margin-right  32
-   :margin-top    6
-   :margin-bottom 10})
-
-(def details-text
-  {:color      colors/gray
-   :text-align :center})
-
-(def separator
-  {:background-color colors/gray-lighter
-   :margin-left      72
-   :align-self       :stretch
-   :height           1
-   :margin-top       8})
-
-(def checkbox-line-container
-  {:margin-left     71
-   :margin-top      13
-   :height          29
-   :flex-direction  :row
-   :justify-content :center})
-
-(def checkbox
-  {:padding         0
-   :justify-content :center
-   :align-items     :center
-   :width           18
-   :height          18
-   :border-radius   2
-   :margin-top      6})
-
-(def checkbox-icon
-  {:tint-color colors/white})
-
-(def checkbox-text-container
-  {:justify-content :center
-   :flex            1
-   :margin-left     13})
-
-(def settings-container
-  {:margin-left 69
-   :height      44
-   :margin-top  6
-   :align-items :flex-start})
-
-(def settings-text
-  {:color colors/gray})
-
-(def settings-link
-  {:color colors/blue})
-
-(def go-to-settings-container
-  {:height          52
-   :margin-left     72
-   :justify-content :center
-   :align-self      :stretch})
-
-(def go-to-settings
-  {:color colors/blue})
@@ -1,32 +0,0 @@
-(ns legacy.status-im.ui.screens.mobile-network-settings.style
-  (:require
-    [legacy.status-im.ui.components.colors :as colors]))
-
-(def container
-  {:flex 1})
-
-(def switch-container
-  {:height 52})
-
-(def details
-  {:margin-right  16
-   :margin-left   16
-   :margin-top    8
-   :margin-bottom 16})
-
-(def use-mobile-data-text
-  {:color colors/gray})
-
-(defn settings-separator
-  []
-  {:align-self       :stretch
-   :height           1
-   :background-color colors/gray-lighter})
-
-(def defaults-container
-  {:height          52
-   :justify-content :center
-   :padding-left    16})
-
-(def defaults
-  {:color colors/blue})
@@ -1,57 +0,0 @@
-(ns legacy.status-im.ui.screens.mobile-network-settings.view
-  (:require-macros [legacy.status-im.utils.views :as views])
-  (:require
-    legacy.status-im.mobile-sync-settings.core
-    [legacy.status-im.ui.components.react :as react]
-    [legacy.status-im.ui.screens.mobile-network-settings.sheets :as sheets]
-    [legacy.status-im.ui.screens.mobile-network-settings.style :as styles]
-    [legacy.status-im.ui.screens.profile.components.views :as profile.components]
-    [re-frame.core :as re-frame]
-    [utils.i18n :as i18n]))
-
-(defn hide-sheet-and-dispatch
-  [event]
-  (re-frame/dispatch [:bottom-sheet/hide-old])
-  (re-frame/dispatch event))
-
-(defn settings-separator
-  []
-  [react/view
-   {:style (styles/settings-separator)}])
-
-;; TODO(Ferossgp): To refactor, uses outdated components
-(views/defview mobile-network-settings
-  []
-  (views/letsubs
-    [{:keys [syncing-on-mobile-network?
-             remember-syncing-choice?]}
-     [:profile/profile]]
-    [:<>
-     [react/view
-      {:style               styles/switch-container
-       :accessibility-label "mobile-network-use-mobile"}
-      [profile.components/settings-switch-item
-       {:label-kw  :t/mobile-network-use-mobile
-        :value     syncing-on-mobile-network?
-        :action-fn #(hide-sheet-and-dispatch [:mobile-network/set-syncing %])}]]
-     [react/view {:style styles/details}
-      [react/text {:style styles/use-mobile-data-text}
-       (i18n/label :t/mobile-network-use-mobile-data)]]
-     [react/view
-      {:style               styles/switch-container
-       :accessibility-label "mobile-network-ask-me"}
-      [profile.components/settings-switch-item
-       {:label-kw  :t/mobile-network-ask-me
-        :value     (not remember-syncing-choice?)
-        :action-fn #(hide-sheet-and-dispatch [:mobile-network/ask-on-mobile-network? %])}]]
-     [settings-separator]
-     [react/view
-      {:style styles/defaults-container}
-      [react/text
-       {:style               styles/defaults
-        :accessibility-label "restore-defaults"
-        :on-press            #(hide-sheet-and-dispatch [:mobile-network/restore-defaults])}
-       (i18n/label :t/restore-defaults)]]]))
-
-(def offline-sheet
-  {:content sheets/offline-sheet})
@@ -1,12 +1,14 @@
 (ns legacy.status-im.ui.screens.peers-stats
  (:require
+    [quo.foundations.colors :as colors]
    [react-native.core :as rn]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

 (defn peers-stats
  []
-  (let [peers-count (rf/sub [:peer-stats/count])]
+  (let [peers-count (rf/sub [:peer-stats/count])
+        theme       (rf/sub [:theme])]
    (rn/use-mount
     (fn []
       (rf/dispatch [:peer-stats/get-count])))
@@ -18,4 +20,5 @@
      {:style {:flex-direction  :row
               :margin-vertical 8
               :justify-content :space-between}}
-      [rn/text (str (i18n/label :t/peers-count) ": " peers-count)]]]))
+      [rn/text {:style {:color (colors/theme-colors colors/neutral-100 colors/white theme)}}
+       (str (i18n/label :t/peers-count) ": " peers-count)]]]))
@@ -1,81 +0,0 @@
-(ns legacy.status-im.ui.screens.privacy-and-security-settings.delete-profile
-  (:require
-    [legacy.status-im.ui.components.chat-icon.screen :as chat-icon.screen]
-    [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]
-    [legacy.status-im.ui.screens.privacy-and-security-settings.events :as delete-profile]
-    [re-frame.core :as re-frame]
-    [reagent.core :as reagent]
-    [status-im.contexts.profile.utils :as profile.utils]
-    [utils.i18n :as i18n]
-    [utils.security.core :as security]))
-
-(defn valid-password?
-  [password]
-  (>= (count password) 6))
-
-(defn on-delete-profile
-  [password]
-  #(do
-     (re-frame/dispatch
-      [::delete-profile/delete-profile @password])
-     (reset! password nil)))
-
-(defn delete-profile
-  []
-  (let [password       (reagent/atom nil)
-        text-input-ref (atom nil)]
-    (fn []
-      (let [profile               @(re-frame/subscribe [:profile/profile])
-            error                 @(re-frame/subscribe [:delete-profile/error])
-            keep-keys-on-keycard? @(re-frame/subscribe
-                                    [:delete-profile/keep-keys-on-keycard?])]
-        (when (and @text-input-ref error (not @password))
-          (.clear ^js @text-input-ref))
-        [react/keyboard-avoiding-view {:style {:flex 1}}
-         [react/scroll-view {:style {:flex 1}}
-          [react/view {:style {:align-items :center}}
-           [quo/text
-            {:weight :bold
-             :size   :x-large}
-            (i18n/label :t/delete-profile)]]
-          [list.item/list-item
-           {:title (profile.utils/displayed-name profile)
-            :icon  [chat-icon.screen/contact-icon-contacts-tab profile]}]
-          [quo/text
-           {:style {:margin-horizontal 24}
-            :align :center
-            :color :negative}
-           (i18n/label :t/delete-profile-warning)]
-          [quo/text-input
-           {:style             {:margin-horizontal 36
-                                :margin-top        36}
-            :show-cancel       false
-            :secure-text-entry true
-            :return-key-type   :next
-            :on-submit-editing nil
-            :auto-focus        true
-            :on-change-text    #(reset! password (security/mask-data %))
-            :bottom-value      36
-            :get-ref           #(reset! text-input-ref %)
-            :error             (when (and error (not @password))
-                                 (if (= :wrong-password error)
-                                   (i18n/label :t/wrong-password)
-                                   (str error)))}]]
-         [react/view {:style {:align-items :center}}
-          [quo/separator]
-          (when (not keep-keys-on-keycard?)
-            [quo/text
-             {:style {:margin-horizontal 24 :margin-bottom 16}
-              :align :center
-              :color :negative}
-             (i18n/label :t/delete-profile-warning)])
-          [react/view
-           {:style {:margin-vertical 8}}
-           [quo/button
-            {:on-press            (on-delete-profile password)
-             :theme               :negative
-             :accessibility-label :delete-profile-confirm
-             :disabled            ((complement valid-password?) @password)}
-            (i18n/label :t/delete-profile)]]]]))))
@@ -1,73 +0,0 @@
-(ns legacy.status-im.ui.screens.privacy-and-security-settings.events
-  (:require
-    [clojure.string :as string]
-    [legacy.status-im.utils.deprecated-types :as types]
-    [native-module.core :as native-module]
-    [re-frame.core :as re-frame]
-    [taoensso.timbre :as log]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]
-    [utils.security.core :as security]))
-
-(defn safe-blank?
-  [s]
-  (or (not s)
-      (string/blank? s)))
-
-(re-frame/reg-fx
- ::delete-profile
- (fn [{:keys [address key-uid callback masked-password]}]
-   (let [hashed-password
-         (-> masked-password
-             security/safe-unmask-data
-             native-module/sha3)]
-     (native-module/verify
-      address
-      hashed-password
-      (fn [result]
-        (let [{:keys [error]} (types/json->clj result)]
-          (log/info "[delete-profile] verify-password" result error)
-          (if-not (safe-blank? error)
-            (callback :wrong-password nil)
-            (native-module/delete-multiaccount
-             key-uid
-             (fn [result]
-               (let [{:keys [error]} (types/json->clj result)]
-                 (callback error nil)))))))))))
-
-(rf/defn delete-profile
-  {:events [::delete-profile]}
-  [{:keys [db] :as cofx} masked-password]
-  (log/info "[delete-profile] delete")
-  (let [{:keys [key-uid wallet-root-address]} (:profile/profile db)]
-    {:db (dissoc db :delete-profile/error)
-     ::delete-profile
-     {:masked-password masked-password
-      :key-uid key-uid
-      :address wallet-root-address
-      :callback
-      (fn [error result]
-        (log/info "[delete-profile] callback" error)
-        (if (safe-blank? error)
-          (re-frame/dispatch [::on-delete-profile-success result])
-          (re-frame/dispatch [::on-delete-profile-failure error])))}}))
-
-(rf/defn on-delete-profile-success
-  {:events [::on-delete-profile-success]}
-  [cofx]
-  (log/info "[delete-profile] on-success")
-  {:effects.utils/show-popup
-   {:title      (i18n/label :t/profile-deleted-title)
-    :content    (i18n/label :t/profile-deleted-content)
-    :on-dismiss #(re-frame/dispatch [:logout])}})
-
-(rf/defn on-delete-profile-failure
-  {:events [::on-delete-profile-failure]}
-  [{:keys [db]} error]
-  (log/info "[delete-profile] on-failure" error)
-  {:db (assoc db :delete-profile/error error)})
-
-(rf/defn keep-keys-on-keycard
-  {:events [::keep-keys-on-keycard]}
-  [{:keys [db] :as cofx} checked?]
-  {:db (assoc-in db [:delete-profile/keep-keys-on-keycard?] checked?)})
@@ -1,34 +0,0 @@
-(ns legacy.status-im.ui.screens.privacy-and-security-settings.messages-from-contacts-only
-  (:require-macros [legacy.status-im.utils.views :as views])
-  (:require
-    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
-    [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]
-    [utils.re-frame :as rf]))
-
-(rf/defn handle-messages-from-contacts-only-switched
-  {:events [::messages-from-contacts-only-switched]}
-  [cofx value]
-  (multiaccounts.update/multiaccount-update cofx
-                                            :messages-from-contacts-only
-                                            value
-                                            {}))
-
-(views/defview messages-from-contacts-only-view
-  []
-  (views/letsubs [{:keys [messages-from-contacts-only]} [:profile/profile]]
-    [react/view {:margin-top 8}
-     [list.item/list-item
-      {:active    (not messages-from-contacts-only)
-       :accessory :radio
-       :title     (i18n/label :t/anyone)
-       :on-press  #(re-frame/dispatch [::messages-from-contacts-only-switched false])}]
-     [list.item/list-item
-      {:active             messages-from-contacts-only
-       :accessory          :radio
-       :title              (i18n/label :t/contacts)
-       :subtitle           (i18n/label :t/messages-from-contacts-only-subtitle)
-       :subtitle-max-lines 4
-       :on-press           #(re-frame/dispatch [::messages-from-contacts-only-switched true])}]]))
@@ -1,175 +0,0 @@
-(ns legacy.status-im.ui.screens.privacy-and-security-settings.views
-  (:require
-    [legacy.status-im.multiaccounts.reset-password.core :as reset-password]
-    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
-    [legacy.status-im.ui.components.core :as components]
-    [legacy.status-im.ui.components.list.item :as list.item]
-    [legacy.status-im.ui.components.react :as react]
-    [quo.core :as quo]
-    [re-frame.core :as re-frame]
-    [react-native.platform :as platform]
-    [status-im.config :as config]
-    [status-im.constants :as constants]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf])
-  (:require-macros [legacy.status-im.utils.views :as views]))
-
-(defn separator
-  []
-  [components/separator {:style {:margin-vertical 8}}])
-
-(def titles
-  {constants/profile-pictures-visibility-contacts-only (i18n/label :t/recent-recipients)
-   constants/profile-pictures-visibility-everyone      (i18n/label :t/everyone)
-   constants/profile-pictures-visibility-none          (i18n/label :t/none)
-   constants/profile-pictures-show-to-contacts-only    (i18n/label :t/recent-recipients)
-   constants/profile-pictures-show-to-everyone         (i18n/label :t/everyone)
-   constants/profile-pictures-show-to-none             (i18n/label :t/none)})
-
-(views/defview privacy-and-security
-  []
-  (views/letsubs [{:keys [preview-privacy?
-                          messages-from-contacts-only
-                          webview-allow-permission-requests?
-                          opensea-enabled?
-                          profile-pictures-visibility]}
-                  [:profile/profile]
-                  has-picture [:profile/has-picture]
-                  profile-pictures-show-to [:multiaccount/profile-pictures-show-to]]
-    [:<>
-     [quo/page-nav
-      {:type       :no-title
-       :background :blur
-       :icon-name  :i/close
-       :on-press   #(rf/dispatch [:navigate-back])}]
-     [react/scroll-view {:padding-vertical 8}
-      [components/list-header (i18n/label :t/privacy)]
-      [list.item/list-item
-       {:size                :small
-        :title               (i18n/label :t/set-dapp-access-permissions)
-        :on-press            #(re-frame/dispatch [:navigate-to :dapps-permissions])
-        :accessibility-label :dapps-permissions-button
-        :chevron             true}]
-      [list.item/list-item
-       {:size                    :small
-        :title                   (if platform/android?
-                                   (i18n/label :t/hide-content-when-switching-apps)
-                                   (i18n/label :t/hide-content-when-switching-apps-ios))
-        :container-margin-bottom 8
-        :active                  preview-privacy?
-        :accessory               :switch
-        :on-press                #(re-frame/dispatch
-                                   [:profile.settings/change-preview-privacy
-                                    ((complement boolean) preview-privacy?)])}]
-      (when config/collectibles-enabled?
-        [list.item/list-item
-         {:size                    :small
-          :title                   (i18n/label :t/display-collectibles)
-          :container-margin-bottom 8
-          :active                  opensea-enabled?
-          :accessory               :switch
-          :on-press                #(re-frame/dispatch
-                                     [::multiaccounts.update/toggle-opensea-nfts-visiblity
-                                      (not opensea-enabled?)])}])
-      [list.item/list-item
-       {:size                :small
-        :title               (i18n/label :t/chat-link-previews)
-        :chevron             true
-        :on-press            #(re-frame/dispatch [:open-modal :legacy-link-previews-settings])
-        :accessibility-label :chat-link-previews}]
-      [list.item/list-item
-       {:size                :small
-        :title               (i18n/label :t/accept-new-chats-from)
-        :chevron             true
-        :accessory           :text
-        :accessory-text      (i18n/label (if messages-from-contacts-only
-                                           :t/contacts
-                                           :t/anyone))
-        :on-press            #(re-frame/dispatch [:navigate-to :messages-from-contacts-only])
-        :accessibility-label :accept-new-chats-from}]
-      [list.item/list-item
-       {:size                :small
-        :title               (i18n/label :t/reset-password)
-        :chevron             true
-        :accessory           :text
-        :on-press            #(do
-                                (re-frame/dispatch [::reset-password/clear-form-vals])
-                                (re-frame/dispatch [:navigate-to :reset-password]))
-        :accessibility-label :reset-password}]
-      (when platform/android?
-        [list.item/list-item
-         {:size               :small
-          :title              (i18n/label :t/webview-camera-permission-requests)
-          :active             webview-allow-permission-requests?
-          :accessory          :switch
-          :subtitle           (i18n/label :t/webview-camera-permission-requests-subtitle)
-          :subtitle-max-lines 2
-          :on-press           #(re-frame/dispatch
-                                [:profile.settings/profile-update
-                                 :webview-allow-permission-requests?
-                                 ((complement boolean) webview-allow-permission-requests?)])}])
-      [separator]
-      [components/list-header (i18n/label :t/privacy-photos)]
-      [list.item/list-item
-       {:size                :small
-        :title               (i18n/label :t/show-profile-pictures)
-        :accessibility-label :show-profile-pictures
-        :accessory           :text
-        :accessory-text      (get titles profile-pictures-visibility)
-        :on-press            #(re-frame/dispatch [:navigate-to :privacy-and-security-profile-pic])
-        :chevron             true}]
-      [list.item/list-item
-       {:size                :small
-        :title               (i18n/label :t/show-profile-pictures-to)
-        :disabled            (not has-picture)
-        :accessibility-label :show-profile-pictures-to
-        :accessory           :text
-        :accessory-text      (get titles profile-pictures-show-to)
-        :on-press            #(re-frame/dispatch [:navigate-to
-                                                  :privacy-and-security-profile-pic-show-to])
-        :chevron             true}]
-
-      [separator]
-      [list.item/list-item
-       {:size                :small
-        :theme               :negative
-        :title               (i18n/label :t/delete-my-profile)
-        :on-press            #(re-frame/dispatch [:navigate-to :delete-profile])
-        :accessibility-label :dapps-permissions-button
-        :chevron             true}]]]))
-
-(defn ppst-radio-item
-  [id value]
-  [list.item/list-item
-   {:active    (= value id)
-    :accessory :radio
-    :title     (get titles id)
-    :on-press  #(re-frame/dispatch [:profile.settings/change-profile-pictures-show-to id])}])
-
-(views/defview profile-pic-show-to
-  []
-  (views/letsubs [{:keys [profile-pictures-show-to]} [:profile/profile]]
-    [react/view {:margin-top 8}
-     [ppst-radio-item constants/profile-pictures-show-to-everyone profile-pictures-show-to]
-     [ppst-radio-item constants/profile-pictures-show-to-contacts-only profile-pictures-show-to]
-     [ppst-radio-item constants/profile-pictures-show-to-none profile-pictures-show-to]
-
-     [react/view {:style {:margin-horizontal 16}}
-      [components/text {:color :secondary}
-       (i18n/label :t/privacy-show-to-warning)]]]))
-
-(defn ppvf-radio-item
-  [id value]
-  [list.item/list-item
-   {:active    (= value id)
-    :accessory :radio
-    :title     (get titles id)
-    :on-press  #(re-frame/dispatch [:profile.settings/profile-update :profile-pictures-visibility id])}])
-
-(views/defview profile-pic
-  []
-  (views/letsubs [{:keys [profile-pictures-visibility]} [:profile/profile]]
-    [react/view {:margin-top 8}
-     [ppvf-radio-item constants/profile-pictures-visibility-everyone profile-pictures-visibility]
-     [ppvf-radio-item constants/profile-pictures-visibility-contacts-only profile-pictures-visibility]
-     [ppvf-radio-item constants/profile-pictures-visibility-none profile-pictures-visibility]]))
@@ -13,12 +13,6 @@
  []
  [rn/scroll-view {:flex 1}
   [components/list-header "Legacy settings"]
-   [list.item/list-item
-    {:icon                :main-icons/security
-     :title               (i18n/label :t/privacy-and-security)
-     :accessibility-label :privacy-and-security-settings-button
-     :chevron             true
-     :on-press            #(re-frame/dispatch [:open-modal :legacy-privacy-and-security])}]
   [list.item/list-item
    {:icon                :main-icons/mobile
     :title               (i18n/label :t/sync-settings)
@@ -8,23 +8,16 @@
    [legacy.status-im.ui.screens.bug-report :as bug-report]
    [legacy.status-im.ui.screens.communities.invite :as communities.invite]
    [legacy.status-im.ui.screens.communities.members :as members]
-    [legacy.status-im.ui.screens.dapps-permissions.views :as dapps-permissions]
    [legacy.status-im.ui.screens.default-sync-period-settings.view :as default-sync-period-settings]
    [legacy.status-im.ui.screens.fleet-settings.views :as fleet-settings]
    [legacy.status-im.ui.screens.glossary.view :as glossary]
    [legacy.status-im.ui.screens.help-center.views :as help-center]
-    [legacy.status-im.ui.screens.link-previews-settings.views :as link-previews-settings]
    [legacy.status-im.ui.screens.log-level-settings.views :as log-level-settings]
-    [legacy.status-im.ui.screens.mobile-network-settings.view :as mobile-network-settings]
    [legacy.status-im.ui.screens.notifications-settings.views :as notifications-settings]
    [legacy.status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver]
    [legacy.status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings]
    [legacy.status-im.ui.screens.pairing.views :as pairing]
    [legacy.status-im.ui.screens.peers-stats :as peers-stats]
-    [legacy.status-im.ui.screens.privacy-and-security-settings.delete-profile :as delete-profile]
-    [legacy.status-im.ui.screens.privacy-and-security-settings.messages-from-contacts-only :as
-     messages-from-contacts-only]
-    [legacy.status-im.ui.screens.privacy-and-security-settings.views :as privacy-and-security]
    [legacy.status-im.ui.screens.profile.seed.views :as profile.seed]
    [legacy.status-im.ui.screens.profile.user.views :as profile.user]
    [legacy.status-im.ui.screens.progress.views :as progress]
@@ -94,17 +87,6 @@
                :insets {:top? platform/android?}}
    :component profile.user/legacy-settings}

-   ;; PRIVACY AND SECURITY
-   {:name      :legacy-privacy-and-security
-    :options   {:topBar {:visible false}
-                :insets {:top? platform/android?}}
-    :component privacy-and-security/privacy-and-security}
-
-   {:name      :legacy-link-previews-settings
-    :options   {:topBar {:visible false}
-                :insets {:top? platform/android?}}
-    :component link-previews-settings/link-previews-settings}
-
   ;; SYNC
   {:name      :legacy-sync-settings
    :options   {:topBar {:visible false}
@@ -150,25 +132,6 @@
   {:name      :edit-mailserver
    :options   {:insets {:top? true}}
    :component edit-mailserver/edit-mailserver}
-   {:name      :dapps-permissions
-    :options   {:topBar (topbar-options :t/dapps-permissions)
-                :insets {:top? true}}
-    :component dapps-permissions/dapps-permissions}
-   {:name      :messages-from-contacts-only
-    :options   {:topBar (topbar-options :t/accept-new-chats-from)
-                :insets {:top? true}}
-    :component messages-from-contacts-only/messages-from-contacts-only-view}
-   {:name      :privacy-and-security-profile-pic-show-to
-    :options   {:topbar (topbar-options :t/show-profile-pictures-to)
-                :insets {:top? true}}
-    :component privacy-and-security/profile-pic-show-to}
-   {:name      :privacy-and-security-profile-pic
-    :options   {:topBar (topbar-options :t/show-profile-pictures)
-                :insets {:top? true}}
-    :component privacy-and-security/profile-pic}
-   {:name      :manage-dapps-permissions
-    :options   {:insets {:top? true}}
-    :component dapps-permissions/manage}
   {:name      :rpc-usage-info
    :options   {:topBar (topbar-options :t/rpc-usage-info)
                :insets {:top? true}}
@@ -181,10 +144,6 @@
    :options   {:topBar (topbar-options :t/fleet-settings)
                :insets {:top? true}}
    :component fleet-settings/fleet-settings}
-   {:name      :mobile-network-settings
-    :options   {:topBar (topbar-options :t/mobile-network-settings)
-                :insets {:top? true}}
-    :component mobile-network-settings/mobile-network-settings}
   {:name      :backup-settings
    :options   {:topBar (topbar-options :t/backup-settings)
                :insets {:top? true}}
@@ -196,9 +155,6 @@
    :options   {:topBar (topbar-options :t/reset-password)
                :insets {:top? true}}
    :component reset-password/reset-password}
-   {:name      :delete-profile
-    :insets    {:bottom? true}
-    :component delete-profile/delete-profile}
   {:name      :default-sync-period-settings
    :options   {:topBar (topbar-options :t/default-sync-period)
                :insets {:top? true}}
@@ -13,8 +13,7 @@

 (views/defview sync-settings
  []
-  (views/letsubs [{:keys [syncing-on-mobile-network?
-                          backup-enabled?
+  (views/letsubs [{:keys [backup-enabled?
                          default-sync-period
                          use-mailservers?]}
                  [:profile/profile]
@@ -27,16 +26,6 @@
       :on-press   #(rf/dispatch [:navigate-back])}]
     [react/scroll-view
      [components/list-header (i18n/label :t/data-syncing)]
-      [list.item/list-item
-       {:size                :small
-        :title               (i18n/label :t/mobile-network-settings)
-        :accessibility-label :notifications-button
-        :on-press            #(re-frame/dispatch [:navigate-to :mobile-network-settings])
-        :chevron             true
-        :accessory           :text
-        :accessory-text      (if syncing-on-mobile-network?
-                               (i18n/label :t/mobile-network-use-mobile)
-                               (i18n/label :t/mobile-network-use-wifi))}]
      [list.item/list-item
       {:size                :small
        :title               (i18n/label :t/backup-settings)
@@ -1,16 +0,0 @@
-(ns legacy.status-im.utils.hex
-  (:require
-    [clojure.string :as string]))
-
-(defn normalize-hex
-  [hex]
-  (when hex
-    (string/lower-case (if (string/starts-with? hex "0x")
-                         (subs hex 2)
-                         hex))))
-
-(defn valid-hex?
-  [hex]
-  (let [hex (normalize-hex hex)]
-    (and (re-matches #"^[0-9a-fA-F]+$" hex)
-         (not= (js/parseInt hex 16) 0))))
@@ -1,58 +0,0 @@
-(ns legacy.status-im.utils.keychain.core
-  (:require
-    [oops.core :as oops]
-    [re-frame.core :as re-frame]
-    [react-native.keychain :as keychain]
-    [taoensso.timbre :as log]
-    [utils.re-frame :as rf]))
-
-(defn- whisper-key-name
-  [address]
-  (str address "-whisper"))
-
-(re-frame/reg-fx
- :keychain/get-keycard-keys
- (fn [[key-uid callback]]
-   (keychain/get-credentials
-    key-uid
-    (fn [encryption-key-data]
-      (if encryption-key-data
-        (keychain/get-credentials
-         (whisper-key-name key-uid)
-         (fn [whisper-key-data]
-           (if whisper-key-data
-             (callback [(oops/oget encryption-key-data "password")
-                        (oops/oget whisper-key-data "password")])
-             (callback nil))))
-        (callback nil))))))
-
-(re-frame/reg-fx
- :keychain/save-keycard-keys
- (fn [[key-uid encryption-public-key whisper-private-key]]
-   (keychain/save-credentials
-    key-uid
-    key-uid
-    encryption-public-key
-    #(when-not %
-       (log/error
-        (str "Error while saving encryption-public-key"))))
-   (keychain/save-credentials
-    (whisper-key-name key-uid)
-    key-uid
-    whisper-private-key
-    #(when-not %
-       (log/error
-        (str "Error while saving whisper-private-key"))))))
-
-(rf/defn get-keycard-keys
-  [_ key-uid]
-  {:keychain/get-keycard-keys
-   [key-uid
-    #(re-frame/dispatch
-      [:multiaccounts.login.callback/get-keycard-keys-success key-uid %])]})
-
-(rf/defn save-keycard-keys
-  [_ key-uid encryption-public-key whisper-private-key]
-  {:keychain/save-keycard-keys [key-uid
-                                encryption-public-key
-                                whisper-private-key]})
@@ -127,7 +127,7 @@
                                                [:app-state
                                                 :current-chat-id
                                                 :network
-                                                 :network-status
+                                                 :network/status
                                                 :peers-summary
                                                 :sync-state
                                                 :view-id
@@ -1,130 +0,0 @@
-(ns legacy.status-im.utils.test
-  (:require
-    [legacy.status-im.utils.deprecated-types :as types]
-    [re-frame.core :as re-frame]))
-
-(def native-status (js/require "../../modules/react-native-status/nodejs/bindings"))
-
-(def fs (js/require "fs"))
-(def path (js/require "path"))
-(def os (js/require "os"))
-
-(def tmpdir (.tmpdir os))
-
-(def test-dir-prefix (.join path tmpdir "status-mobile-tests"))
-
-(def test-dir (.mkdtempSync fs test-dir-prefix))
-
-(def initialized? (atom false))
-
-(defn signal-received-callback
-  [a]
-  (re-frame/dispatch [:signals/signal-received a]))
-
-;; We poll for signals, could not get callback working
-(defn init!
-  []
-  (when-not @initialized?
-    (.setSignalEventCallback native-status)
-    (reset! initialized? true)
-    (js/setInterval (fn []
-                      (.pollSignal native-status signal-received-callback)
-                      100))))
-
-(def ui-helper
-  (clj->js
-   {:clearCookies     identity
-    :clearStorageAPIs identity}))
-
-(def encryption-utils
-  (clj->js
-   {:sha3
-    (fn [s] (.sha3 native-status s))
-    :setBlankPreviewFlag
-    identity
-    :encodeTransfer
-    (fn [to-norm amount-hex]
-      (.encodeTransfer native-status to-norm amount-hex))
-    :hexToNumber
-    (fn [hex] (.hexToNumber native-status hex))
-    :decodeParameters
-    (fn [decode-param-json]
-      (.decodeParameters native-status decode-param-json))
-    :numberToHex
-    (fn [num-str] (.numberToHex native-status num-str))
-    :initKeystore
-    (fn [key-uid callback]
-      (callback (.initKeystore native-status
-                               (str test-dir "/keystore/" key-uid))))
-    :multiformatDeserializePublicKey
-    (fn [public-key deserialization-key callback]
-      (callback (.multiformatDeserializePublicKey
-                 native-status
-                 public-key
-                 deserialization-key)))}))
-
-(def account-manager
-  (clj->js
-   {:openAccounts
-    (fn [callback]
-      (callback (.openAccounts native-status test-dir)))
-    :createAccountAndLogin
-    (fn [request] (.createAccountAndLogin native-status request))
-    :logout
-    (fn [] (.logout native-status))
-    :multiAccountImportMnemonic
-    (fn [json callback]
-      (callback (.multiAccountImportMnemonic native-status json)))
-    :multiAccountLoadAccount
-    (fn [json callback]
-      (callback (.multiAccountLoadAccount native-status json)))
-    :multiAccountDeriveAddresses
-    (fn [json callback]
-      (callback (.multiAccountDeriveAddresses native-status json)))
-    :multiAccountGenerateAndDeriveAddresses
-    (fn [json callback]
-      (callback (.multiAccountGenerateAndDeriveAddresses native-status json)))
-    :multiAccountStoreDerived
-    (fn [json callback]
-      (callback (.multiAccountStoreDerivedAccounts native-status json)))}))
-
-(def utils
-  (clj->js
-   {:backupDisabledDataDir
-    (fn [] (str test-dir "/backup"))
-    :keystoreDir (fn [] "")
-    :toChecksumAddress
-    (fn [address] (.toChecksumAddress native-status address))
-    :checkAddressChecksum
-    (fn [address] (.checkAddressChecksum native-status address))
-    :validateMnemonic
-    (fn [json callback] (callback (.validateMnemonic native-status json)))
-    :isAddress
-    (fn [address] (.isAddress native-status address))}))
-
-(def log-manager
-  (clj->js
-   {:logFileDirectory
-    (fn [] (str test-dir "/log"))
-    :initLogging
-    (fn [enabled mobile-system log-level callback]
-      (callback (.initLogging native-status
-                              (types/clj->json {:Enabled      enabled
-                                                :MobileSystem mobile-system
-                                                :Level        log-level
-                                                :File         (str test-dir "/geth.log")}))))}))
-
-(def network
-  (clj->js
-   {:callPrivateRPC
-    (fn [payload callback]
-      (callback (.callPrivateRPC native-status payload)))}))
-
-(def status
-  (clj->js
-   {:getNodeConfig
-    (fn [] (types/clj->json {:WakuV2Config ""}))
-    :fleets
-    (fn [] (.fleets native-status))
-    :startLocalNotifications
-    identity}))
@@ -137,3 +137,19 @@
                    :on-error   #(log/error "failed to set light client"
                                            {:error    %
                                             :enabled? enabled?})}]})
+
+(rf/defn toggle-store-confirmations
+  {:events [:wakuv2.ui/toggle-store-confirmations]}
+  [{:keys [db]} enabled?]
+  {:db            (assoc-in db
+                   [:profile/profile :wakuv2-config :EnableStoreConfirmationForMessagesSent]
+                   enabled?)
+
+   :json-rpc/call [{:method     "wakuext_setStoreConfirmationForMessagesSent"
+                    :params     [{:enabled enabled?}]
+                    :on-success (fn []
+                                  (log/info "store confirmation set successfully" enabled?)
+                                  (re-frame/dispatch [:logout]))
+                    :on-error   #(log/error "failed to set store confirmation"
+                                            {:error    %
+                                             :enabled? enabled?})}]})
@@ -110,8 +110,11 @@
 (def status-keycard
  #js
   {:default #js
-              {:nfcIsSupported (fn [] #js {:then identity})
-               :nfcIsEnabled   (fn [] #js {:then identity})}})
+              {:nfcIsSupported     (fn [] #js {:then identity})
+               :nfcIsEnabled       (fn [] #js {:then identity})
+               :getApplicationInfo (fn [] #js {:then identity})
+               :getKeys            (fn [] #js {:then identity})
+               :setPairings        (fn [] #js {:then identity})}})

 (def snoopy #js {:default #js {}})
 (def snoopy-filter #js {:default #js {}})
@@ -168,7 +171,7 @@
  #js
   {:getEnforcing {}})

-(def net-info #js {})
+(def net-info #js {:addEventListener identity})
 (def react-native-biometrics #js {:default {}})
 (def react-native-static-safe-area-insets #js {:default {}})

@@ -72,10 +72,12 @@
  (log/debug "[native-module] init-keystore" key-uid)
  (.initKeystore ^js (encryption) key-uid callback))

-(defn open-accounts
-  [callback]
-  (log/debug "[native-module] open-accounts")
-  (.openAccounts ^js (account-manager) #(callback (types/json->clj %))))
+(defn initialize-application
+  [request callback]
+  (log/debug "[native-module] initialize-application")
+  (.initializeApplication ^js (account-manager)
+                          (types/clj->json request)
+                          #(callback (types/json->clj %))))

 (defn prepare-dir-and-update-config
  [key-uid config callback]
@@ -85,31 +87,6 @@
                              config
                              #(callback (types/json->clj %))))

-(defn save-multiaccount-and-login-with-keycard
-  "NOTE: chat-key is a whisper private key sent from keycard"
-  [key-uid multiaccount-data password settings config accounts-data chat-key]
-  (log/debug "[native-module] save-account-and-login-with-keycard")
-  (init-keystore
-   key-uid
-   #(.saveAccountAndLoginWithKeycard
-     ^js (account-manager)
-     multiaccount-data
-     password
-     settings
-     config
-     accounts-data
-     chat-key)))
-
-(defn login-with-config
-  "NOTE: beware, the password has to be sha3 hashed"
-  [key-uid account-data hashed-password config]
-  (log/debug "[native-module] loginWithConfig")
-  (clear-web-data)
-  (let [config (if config (types/clj->json config) "")]
-    (init-keystore
-     key-uid
-     #(.loginWithConfig ^js (account-manager) account-data hashed-password config))))
-
 (defn login-account
  "NOTE: beware, the password has to be sha3 hashed"
  [{:keys [keyUid] :as request}]
@@ -151,19 +128,6 @@
  (clear-web-data)
  (.logout ^js (account-manager)))

-(defn multiaccount-load-account
-  "NOTE: beware, the password has to be sha3 hashed
-
-   this function is used after storing an account when you still want to
-   derive accounts from it, because saving an account flushes the loaded keys
-   from memory"
-  [address hashed-password callback]
-  (log/debug "[native-module] multiaccount-load-account")
-  (.multiAccountLoadAccount ^js (account-manager)
-                            (types/clj->json {:address  address
-                                              :password hashed-password})
-                            callback))
-
 (defn multiaccount-derive-addresses
  "NOTE: this should be named derive-accounts
   this only derive addresses, they still need to be stored
@@ -177,38 +141,6 @@
                                                    :paths     paths})
                                  callback)))

-(defn multiaccount-store-account
-  "NOTE: beware, the password has to be sha3 hashed
-
-   this stores the account and flush keys in memory so
-   in order to also store derived accounts like initial wallet
-   and chat accounts, you need to load the account again with
-   `multiaccount-load-account` before using `multiaccount-store-derived`
-   and the id of the account stored will have changed"
-  [account-id key-uid hashed-password callback]
-  (log/debug "[native-module] multiaccount-store-account")
-  (when (status)
-    (init-keystore
-     key-uid
-     #(.multiAccountStoreAccount ^js (account-manager)
-                                 (types/clj->json {:accountID account-id
-                                                   :password  hashed-password})
-                                 callback))))
-
-(defn multiaccount-store-derived
-  "NOTE: beware, the password has to be sha3 hashed"
-  [account-id key-uid paths hashed-password callback]
-  (log/debug "[native-module] multiaccount-store-derived"
-             "account-id"
-             account-id)
-  (init-keystore
-   key-uid
-   #(.multiAccountStoreDerived ^js (account-manager)
-                               (types/clj->json {:accountID account-id
-                                                 :paths     paths
-                                                 :password  hashed-password})
-                               callback)))
-
 (defn multiaccount-generate-and-derive-addresses
  "used to generate multiple multiaccounts for onboarding
   NOTE: nothing is saved so you will need to use
@@ -232,37 +164,12 @@
                                                 :Bip39Passphrase password})
                               callback))

-(defn multiaccount-import-private-key
-  [private-key callback]
-  (log/debug "[native-module] multiaccount-import-private-key")
-  (.multiAccountImportPrivateKey ^js (account-manager)
-                                 (types/clj->json {:privateKey private-key})
-                                 callback))
-
 (defn verify
  "NOTE: beware, the password has to be sha3 hashed"
  [address hashed-password callback]
  (log/debug "[native-module] verify")
  (.verify ^js (account-manager) address hashed-password callback))

-(defn verify-database-password
-  "NOTE: beware, the password has to be sha3 hashed"
-  [key-uid hashed-password callback]
-  (log/debug "[native-module] verify-database-password")
-  (.verifyDatabasePassword ^js (account-manager) key-uid hashed-password callback))
-
-(defn login-with-keycard
-  [{:keys [key-uid multiaccount-data password chat-key node-config]}]
-  (log/debug "[native-module] login-with-keycard")
-  (clear-web-data)
-  (init-keystore
-   key-uid
-   #(.loginWithKeycard ^js (account-manager)
-                       multiaccount-data
-                       password
-                       chat-key
-                       (types/clj->json node-config))))
-
 (defn set-soft-input-mode
  [mode]
  (log/debug "[native-module]  set-soft-input-mode")
@@ -331,6 +238,11 @@
             :key input-key})
  (.deserializeAndCompressKey ^js (encryption) input-key callback))

+(defn serialize-legacy-key
+  "Compresses an old format public key (0x04...) to the new one zQ..."
+  [public-key]
+  (.serializeLegacyKey ^js (encryption) public-key))
+
 (defn compressed-key->public-key
  "Provides compressed key to status-go and gets back the uncompressed public key via deserialization"
  [public-key deserialization-key callback]
@@ -420,7 +332,9 @@
 (defn set-blank-preview-flag
  [flag]
  (log/debug "[native-module] set-blank-preview-flag")
-  (.setBlankPreviewFlag ^js (encryption) flag))
+  ;; Sometimes the app crashes during logout because `flag` is nil.
+  (when-not (nil? flag)
+    (.setBlankPreviewFlag ^js (encryption) flag)))

 (defn get-device-model-info
  []
@@ -473,6 +387,11 @@
  (log/debug "[native-module] encode-transfer")
  (.encodeTransfer ^js (encryption) to-norm amount-hex))

+(defn encode-function-call
+  [method params]
+  (log/debug "[native-module] encode-function-call")
+  (.encodeFunctionCall ^js (encryption) method (types/clj->json params)))
+
 (defn decode-parameters
  [bytes-string types]
  (log/debug "[native-module] decode-parameters")
@@ -513,6 +432,14 @@
  (let [result (.checkAddressChecksum ^js (utils) address)]
    (types/json->clj result)))

+(defn toggle-centralized-metrics
+  [enabled callback]
+  (.toggleCentralizedMetrics ^js (status) (types/clj->json {:enabled enabled}) callback))
+
+(defn add-centralized-metric
+  [metric]
+  (.addCentralizedMetric ^js (status) (types/clj->json metric) #(log/debug "pushed metric" % metric)))
+
 (defn address?
  [address]
  (log/debug "[native-module] address?")
@@ -533,6 +460,13 @@
   (log/debug "[native-module] validate-mnemonic")
   (.validateMnemonic ^js (utils) mnemonic callback)))

+(defn validate-connection-string
+  [connection-string]
+  (log/debug "[native-module] validate-connection-string")
+  (->> connection-string
+       (.validateConnectionString ^js (utils))
+       types/json->clj))
+
 (defn delete-multiaccount
  "Delete multiaccount from database, deletes multiaccount's database and
  key files."
@@ -643,7 +577,6 @@
   (native-utils/promisify-native-module-call create-account-from-private-key private-key))
  ([private-key callback]
   (log/debug "[native-module] create-account-from-private-key")
-
   (.createAccountFromPrivateKey ^js (account-manager)
                                 (types/clj->json {:privateKey private-key})
                                 callback)))
@@ -5,6 +5,7 @@
 (defn- get-dimensions
  [size]
  (case size
+    :size-32 32
    :size-24 24
    :size-20 20
    nil))
@@ -1,5 +1,6 @@
 (ns quo.components.avatars.token-avatar.view
  (:require [quo.components.avatars.token-avatar.style :as style]
+            [quo.components.utilities.token.view :as token]
            [react-native.core :as rn]
            [react-native.hole-view :as hole-view]
            [react-native.platform :as platform]
@@ -12,13 +13,14 @@
     [:map {:closed true}
      [:type {:optional true} [:enum :asset :collectible]]
      [:context? {:optional true} [:maybe :boolean]]
-      [:image :schema.common/image-source]
+      [:image {:optional true} [:maybe :schema.common/image-source]]
+      [:token {:optional true} [:maybe [:or :keyword :string]]]
      [:network-image {:optional true} [:maybe :schema.common/image-source]]
      [:container-style {:optional true} [:maybe :map]]]]]
   :any])

 (defn- view-internal
-  [{:keys [type context? image network-image container-style]}]
+  [{:keys [type context? image token network-image container-style]}]
  [rn/view
   {:style               (merge style/container container-style)
    :accessibility-label :token-avatar}
@@ -32,9 +34,11 @@
                      [])
             :style style/hole-view}
      platform/android? (assoc :key context?))
-    [rn/image
-     {:source image
-      :style  (style/image type)}]]
+    [token/view
+     {:size         :size-32
+      :token        token
+      :style        (style/image type)
+      :image-source image}]]
   (when context?
     [rn/image
      {:source network-image
@@ -21,15 +21,17 @@
                       (colors/theme-colors colors/white colors/neutral-95 theme))})

 (defn buttons-container
-  [actions]
-  {:flex-direction     (if (= actions :two-vertical-actions) :column :row)
-   :justify-content    :space-around
-   :padding-vertical   12
-   :gap                12
-   :padding-horizontal 20})
+  [actions container-style]
+  (merge
+   {:flex-direction     (if (= actions :two-vertical-actions) :column :row)
+    :justify-content    :space-around
+    :padding-vertical   12
+    :gap                12
+    :padding-horizontal 20}
+   container-style))

 (def button-container
-  {:flex 1})
+  {:flex-grow 1})

 (def description-top
  {:flex-direction  :row
--- a/Show More
+++ b/Show More