update status-go

Fix background color on communities/chat home (#19520 )
more logs
2024-04-12 13:16:25 +01:00 · 2024-04-04 16:10:31 +05:30 · 2024-04-03 13:42:46 +01:00 · 2024-04-03 13:01:47 +01:00 · 2024-04-03 13:36:58 +02:00 · 2024-04-03 13:36:54 +02:00
674 changed files with 15632 additions and 18044 deletions
@@ -26,6 +26,7 @@
                                                          malli.generator         malli.generator
                                                          malli.transform         malli.transform
                                                          malli.util              malli.util
+                                                          promesa.core            p
                                                          schema.core             schema
                                                          status-im.feature-flags ff
                                                          taoensso.timbre         log}}
@@ -0,0 +1,9 @@
+{:lint-as {promesa.core/->          clojure.core/->
+           promesa.core/->>         clojure.core/->>
+           promesa.core/as->        clojure.core/as->
+           promesa.core/let         clojure.core/let
+           promesa.core/plet        clojure.core/let
+           promesa.core/loop        clojure.core/loop
+           promesa.core/recur       clojure.core/recur
+           promesa.core/with-redefs clojure.core/with-redefs
+           promesa.core/doseq       clojure.core/doseq}}
@@ -195,5 +195,5 @@ test/appium/tests/users.py
 ## git hooks
 lefthook.yml

-## metro server logs
-metro-server-logs.log
+## build time logs
+/logs/*.log
@@ -22,34 +22,37 @@
  :multi-lhs-hang]

 :fn-map
- {"reg-sub"         :arg1-pair
-  "h/describe"      :arg1-body
-  "h/describe-skip" :arg1-body
-  "h/describe-only" :arg1-body
-  "h/test"          :arg1-body
-  "h/test-skip"     :arg1-body
-  "h/test-only"     :arg1-body
-  "global.describe" :arg1-body
-  "global.test"     :arg1-body
-  "list-comp"       :binding
-  "defview"         :arg1-body
-  "letsubs"         :binding
-  "with-let"        "let"
-  "reg-event-fx"    :arg1-pair
-  "reg-fx"          :arg1-pair
-  "testing"         :arg1-body
-  "deftest-sub"     :arg1-body
-  "wait-for"        :arg1-body
-  "with-deps-check" :arg1-body
-  "schema/=>"       :arg1-body
-  "->"              [:noarg1-body
-                     {:list               {:constant-pair? false :force-nl? false}
-                      :next-inner-restore [[:list :constant-pair?]]}]
-  "set!"            "reset!"
-  "assoc-when"      "assoc"
-  "assoc-some"      "assoc"
-  "conj-when"       "conj"
-  "conj-some"       "conj"}
+ {"reg-sub"           :arg1-pair
+  "h/describe"        :arg1-body
+  "h/describe-skip"   :arg1-body
+  "h/describe-only"   :arg1-body
+  "h/test"            :arg1-body
+  "h/test-skip"       :arg1-body
+  "h/test-only"       :arg1-body
+  "test/async"        :arg1-body
+  "test/use-fixtures" :arg1-body
+  "global.describe"   :arg1-body
+  "global.test"       :arg1-body
+  "list-comp"         :binding
+  "defview"           :arg1-body
+  "letsubs"           :binding
+  "with-let"          "let"
+  "reg-event-fx"      :arg1-pair
+  "reg-fx"            :arg1-pair
+  "testing"           :arg1-body
+  "deftest-sub"       :arg1-body
+  "test-async"        :arg1-body
+  "wait-for"          :arg1-body
+  "with-deps-check"   :arg1-body
+  "schema/=>"         :arg1-body
+  "->"                [:noarg1-body
+                       {:list               {:constant-pair? false :force-nl? false}
+                        :next-inner-restore [[:list :constant-pair?]]}]
+  "set!"              "reset!"
+  "assoc-when"        "assoc"
+  "assoc-some"        "assoc"
+  "conj-when"         "conj"
+  "conj-some"         "conj"}

 :style-map
 {:no-comma {:map {:comma? false}}
@@ -36,6 +36,8 @@ endif
 export TMPDIR = /tmp/tmp-status-mobile-$(BUILD_TAG)
 # This has to be specified for both the Node.JS server process and the Qt process.
 export REACT_SERVER_PORT ?= 5001
+# Default metro port used by scripts/run-android.sh.
+export RCT_METRO_PORT ?= 8081
 # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
 export NODE_OPTIONS += --openssl-legacy-provider
 # The path can be anything, but home is usually safest.
@@ -54,12 +56,6 @@ export _NIX_KEEP ?= TMPDIR,BUILD_ENV,\
 # Useful for Android release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)

-# MacOS root is read-only, read nix/README.md for details
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Darwin)
-export NIX_IGNORE_SYMLINK_STORE=1
-endif
-
 #----------------
 # Nix targets
 #----------------
@@ -294,11 +290,8 @@ show-ios-devices: ##@other shows connected ios device and its name
 # TODO: fix IOS_STATUS_GO_TARGETS to be either amd64 or arm64 when RN is upgraded
 run-ios-device: export TARGET := ios
 run-ios-device: export IOS_STATUS_GO_TARGETS := ios/arm64;iossimulator/amd64
-run-ios-device: ##@run iOS app and start it on a connected device by its name
-ifndef DEVICE_NAME
-	$(error Usage: make run-ios-device DEVICE_NAME=your-device-name)
-endif
-	react-native run-ios --device "$(DEVICE_NAME)"
+run-ios-device: ##@run iOS app and start it on the first connected iPhone
+	@scripts/run-ios-device.sh

 #--------------
 # Tests
@@ -338,13 +331,14 @@ shadow-server:##@ Start shadow-cljs in server mode for watching

 _test-clojure: export TARGET := clojure
 _test-clojure: export WATCH ?= false
+_test-clojure: status-go-library
 _test-clojure:
 ifeq ($(WATCH), true)
-	yarn install && \
+	yarn node-pre-gyp rebuild && \
 	yarn shadow-cljs compile mocks && \
 	nodemon --exec "yarn shadow-cljs compile test && node --require ./test-resources/override.js $$SHADOW_OUTPUT_TO" -e cljs
 else
-	yarn install && \
+	yarn node-pre-gyp rebuild && \
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
 	node --require ./test-resources/override.js "$$SHADOW_OUTPUT_TO"
@@ -357,8 +351,9 @@ test: _test-clojure

 test-watch-for-repl: export SHADOW_OUTPUT_TO := target/test/test.js
 test-watch-for-repl: export SHADOW_NS_REGEXP := .*-test$$
+test-watch-for-repl: status-go-library
 test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connections
-	yarn install
+	yarn node-pre-gyp rebuild
 	rm -f target/test/test.js
 	yarn shadow-cljs compile mocks && \
 	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
@@ -366,7 +361,7 @@ test-watch-for-repl: ##@test Watch all Clojure tests and support REPL connection
 		"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
-test-unit: export SHADOW_NS_REGEXP := ^(?!tests\.integration-test)(?!tests-im\.contract-test).*-test$$
+test-unit: export SHADOW_NS_REGEXP := ^(?!tests\.integration-test)(?!tests\.contract-test).*-test$$
 test-unit: ##@test Run unit tests
 test-unit: _test-clojure

@@ -380,25 +375,25 @@ test-contract: export SHADOW_NS_REGEXP := ^tests\.contract-test.*$$
 test-contract: ##@test Run contract tests
 test-contract: _test-clojure

-android-test: jsbundle
-android-test: export TARGET := android
-android-test:
+test-android: jsbundle
+test-android: export TARGET := android
+test-android: ##@test Android Gradle test
 	cd android && ./gradlew test

-component-test-watch: export TARGET := clojure
-component-test-watch: export COMPONENT_TEST := true
-component-test-watch: export BABEL_ENV := test
-component-test-watch: export JEST_USE_SILENT_REPORTER := false
-component-test-watch: ##@ Watch tests and re-run no changes to cljs files
+test-component-watch: export TARGET := clojure
+test-component-watch: export COMPONENT_TEST := true
+test-component-watch: export BABEL_ENV := test
+test-component-watch: export JEST_USE_SILENT_REPORTER := false
+test-component-watch: ##@ Watch tests and re-run no changes to cljs files
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs

-component-test: export TARGET := clojure
-component-test: export COMPONENT_TEST := true
-component-test: export BABEL_ENV := test
-component-test: export JEST_USE_SILENT_REPORTER := false
-component-test: ##@test Run component tests once in NodeJS
+test-component: export TARGET := clojure
+test-component: export COMPONENT_TEST := true
+test-component: export BABEL_ENV := test
+test-component: export JEST_USE_SILENT_REPORTER := false
+test-component: ##@test Run component tests once in NodeJS
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	yarn shadow-cljs compile component-test && \
@@ -37,7 +37,7 @@ project dependencies, coding guidelines and testing procedures.
 Check out our [coding guidelines](doc/new-guidelines.md).

 - **Community Management**
-Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and the long-lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)
+Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and the long-lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.app/manifesto)

 - **Specification / Documentation**
 John Dewey once said, "Education is not preparation for life; education is life *itself* ". Developers and Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, check out our [docs](doc/) and see how you can improve what we have.
@@ -53,10 +53,10 @@ Status is a visual interface to make permanent changes on the Blockchain, it han

 - **Evangelism**
 Help us spread the word! Tell a friend *right now*, in fact, tell **everyone** - yell from a mountain if you have to, every person counts! If you've got a great story to tell or have some interesting way you've spread the word about Status let us know about it in our [chat](https://join.status.im/chat/public/status)
-
+  
 ## Give me Binaries!

-You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/), or by [building it yourself](https://status.im/technical/build_status/).
+You can get our Beta builds for both Android and iOS on our [website](https://status.app), through our [nightly builds](https://status.im/nightly/), or by [building it yourself](doc/starting-guide.md).

 ## Core Contributors

@@ -1 +1 @@
-1.25.0
+2.28.0
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -15,7 +15,7 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '20',
-      artifactNumToKeepStr: '10',
+      artifactNumToKeepStr: '1',
    ))
    /* Allows combined build to copy */
    copyArtifactPermission('/status-mobile/*')
@@ -34,10 +34,10 @@ pipeline {
  }

  environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = "android${utils.isE2EBuild() ? "-e2e" : ""}"
+    LANG     = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    PLATFORM = "android${utils.isE2EBuild() ? "-e2e" : ""}"
    BUILD_ENV = 'prod'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    FASTLANE_DISABLE_COLORS = 1
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 pipeline {
  agent { label 'linux' }
@@ -13,7 +13,7 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '30',
-      artifactNumToKeepStr: '10',
+      artifactNumToKeepStr: '1',
    ))
  }

@@ -35,8 +35,6 @@ pipeline {
    stage('Prep') {
      steps { script {
        println("Current JOB: ${env.JOB_NAME}")
-        /* just for a shorter access */
-        btype = utils.getBuildType()
      } }
    }
    stage('Build') {
@@ -84,10 +82,8 @@ pipeline {
      when { expression { params.PUBLISH } }
      steps { script {
        switch (btype) {
-          case 'nightly':
-            /* Create JSON file with newest build URLs */
+          case 'nightly': /* Create JSON file with newest build URLs */
            s3.updateBucketJSON(urls, 'latest.json');
-            build(job: 'website/status.im', wait: false);
            break;
          case 'release':
            github.publishReleaseFiles(repo: 'status-mobile');
@@ -1,12 +1,12 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 pipeline {
  agent { label 'linux' }

  triggers {
-    // Nightly at 2am
-    cron 'H 2 * * *'
+    // Nightly at 0am
+    cron 'H 0 * * *'
  }

  parameters {
@@ -23,6 +23,7 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '30',
+      artifactNumToKeepStr: '1',
    ))
  }

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

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -23,7 +23,7 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '20',
-      artifactNumToKeepStr: '10',
+      artifactNumToKeepStr: '1',
    ))
    /* Allows combined build to copy */
    copyArtifactPermission('/status-mobile/*')
@@ -34,13 +34,11 @@ pipeline {
  }

  environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'ios'
+    LANG     = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    PLATFORM = 'ios'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
-    /* See nix/README.md */
-    NIX_IGNORE_SYMLINK_STORE = 1
    FASTLANE_DISABLE_COLORS = 1
    BUNDLE_PATH = "${HOME}/.bundle"
  }
@@ -65,7 +63,7 @@ pipeline {
      }
      post {
        failure {
-          archiveArtifacts 'ios/logs/*'
+          archiveArtifacts 'logs/*'
        }
      }
    }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -10,12 +10,12 @@ pipeline {
  options {
    timestamps()
    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 15, unit: 'MINUTES')
+    timeout(time: 20, unit: 'MINUTES')
    /* Limit builds retained */
    buildDiscarder(logRotator(
      numToKeepStr: '10',
      daysToKeepStr: '20',
-      artifactNumToKeepStr: '10',
+      artifactNumToKeepStr: '1',
    ))
    /* Abort old PR builds. */
    disableConcurrentBuilds(
@@ -29,53 +29,47 @@ pipeline {
      description: 'Specify build type. Values: pr / e2e / nightly / release',
      defaultValue: 'pr',
    )
+    booleanParam(
+      name: 'RUN_CONTRACT_TESTS',
+      description: 'Whether to run optional and slow contract tests.',
+      defaultValue: false,
+    )
  }

  environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'tests'
+    LANG     = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    PLATFORM = 'tests'
    BUILD_ENV = 'prod'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    LOG_FILE = utils.pkgFilename(ext: 'log', arch: 'tests')
+    CLJ_LINTER_PRINT_WARNINGS = 'true'
  }

  stages {
-    stage('Checks') {
+    stage('Test') {
      parallel {
        stage('Lint') {
-          steps {
-            sh """#!/bin/bash
-              set -eo pipefail
-              make lint CLJ_LINTER_PRINT_WARNINGS=true 2>&1 | tee ${LOG_FILE}
-            """
-          }
+          steps { make('lint') }
        }
-        stage('Unit Tests') {
-          steps {
-            sh """#!/bin/bash
-              set -eo pipefail
-              make test-unit 2>&1 | tee -a ${LOG_FILE}
-            """
-          }
+        stage('Unit') {
+          steps { make('test-unit') }
+        }
+        stage('Component') {
+          steps { make('test-component') }
        }
      }
    }
-    stage('Integration Tests') {
-      steps {
-        sh """#!/bin/bash
-          set -eo pipefail
-          make test-integration 2>&1 | tee -a ${LOG_FILE}
-        """
-      }
-    }
-    stage('Component Tests') {
-      steps {
-        sh """#!/bin/bash
-          set -eo pipefail
-          make component-test 2>&1 | tee -a ${LOG_FILE}
-        """
+    stage('Heavy Test') {
+      parallel {
+        stage('Contract') {
+          when { expression { params.RUN_CONTRACT_TESTS } }
+          steps { make('test-contract') }
+        }
+        stage('Integration') {
+          steps { make('test-integration') }
+        }
      }
    }
    stage('Upload') {
@@ -92,3 +86,10 @@ pipeline {
    always  { sh 'make purge' }
  }
 }
+
+def make(target) {
+  sh """#!/bin/bash
+    set -eo pipefail
+    make ${target} 2>&1 | tee -a ${LOG_FILE}
+  """
+}
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 pipeline {

@@ -29,6 +29,11 @@ pipeline {

  options {
    disableConcurrentBuilds()
+    buildDiscarder(logRotator(
+      numToKeepStr: '10',
+      daysToKeepStr: '30',
+      artifactNumToKeepStr: '1',
+    ))
  }

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

 pipeline {

@@ -47,6 +47,11 @@ pipeline {
  options {
    disableConcurrentBuilds()
    timeout(time: 90, unit: 'MINUTES')
+    buildDiscarder(logRotator(
+      numToKeepStr: '10',
+      daysToKeepStr: '30',
+      artifactNumToKeepStr: '1',
+    ))
  }

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

 pipeline {

@@ -28,6 +28,11 @@ pipeline {

  options {
    disableConcurrentBuilds()
+    buildDiscarder(logRotator(
+      numToKeepStr: '10',
+      daysToKeepStr: '30',
+      artifactNumToKeepStr: '1',
+    ))
  }


@@ -1,17 +1,15 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 pipeline {
  agent { label 'macos' }

  environment {
-    LANG      = 'en_US.UTF-8'
-    LANGUAGE  = 'en_US.UTF-8'
-    LC_ALL    = 'en_US.UTF-8'
-    TARGET    = 'ios'
+    LANG     = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    PLATFORM = 'ios'
    FASTLANE_DISABLE_COLORS = 1
-    /* See nix/README.md */
-    NIX_IGNORE_SYMLINK_STORE = 1
    /* avoid writing to r/o /nix */
    GEM_HOME  = '~/.rubygems'
  }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -18,8 +18,6 @@ pipeline {
  }

  environment {
-    /* See nix/README.md */
-    NIX_IGNORE_SYMLINK_STORE = 1
    /* we source .bash_profile to be able to use nix-store */
    NIX_SSHOPTS = "-oStrictHostKeyChecking=no"
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
@@ -36,6 +34,7 @@ pipeline {
    buildDiscarder(logRotator(
      numToKeepStr: '20',
      daysToKeepStr: '30',
+      artifactNumToKeepStr: '1',
    ))
  }

@@ -1,17 +1,15 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 pipeline {
  agent { label 'linux' }

  environment {
-    LANG      = 'en_US.UTF-8'
-    LANGUAGE  = 'en_US.UTF-8'
-    LC_ALL    = 'en_US.UTF-8'
-    TARGET    = 'ios'
+    LANG     = 'en_US.UTF-8'
+    LANGUAGE = 'en_US.UTF-8'
+    LC_ALL   = 'en_US.UTF-8'
+    PLATFORM = 'ios'
    FASTLANE_DISABLE_COLORS = 1
-    /* See nix/README.md */
-    NIX_IGNORE_SYMLINK_STORE = 1
    /* avoid writing to r/o /nix */
    GEM_HOME  = '~/.rubygems'
  }
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.7'
+library 'status-jenkins-lib@v1.8.12'

 pipeline {
  agent {
@@ -10,6 +10,8 @@

 [Coding guidelines](new-guidelines.md)

+[UI components coding guidelines](ui-guidelines.md)
+
 [Release Checklist](release-checklist.md)

 [Release Guide](release-guide.md)
@@ -28,6 +30,8 @@

 [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)
@@ -16,10 +16,10 @@ Both of these links are showing it for React-Testing-Library (not Native) howeve
 ## Running the tests
 To run these tests there are two methods.

-`make component-test` 
+`make test-component`
 setups and runs the test suite once.

-`make component-test-watch` 
+`make test-component-watch`
 setups and runs the test suite and watches for code changes will then retrigger the test suite.

 ## Writing Tests
@@ -38,7 +38,7 @@ There is a file of utility functions defined in "src/test_helpers/component.cljs
 ## Configuration
 Status Mobile has a bespoke tech stack, as such there is more complexities to configuring the tests.

-### Shadow-CLJS 
+### Shadow-CLJS
 the configuration for compiling our tests are defined in the "shadow-cljs.edn" file.
 The three main parts of this are
 `:target :npm-module`
@@ -47,9 +47,9 @@ Needed for the configuration we are using
 a vector of entry points for the test files.
 and the `ns-regexp` to specify what tests to find. Since we have multiple forms of tests we decided that "component-spec" is the least likely to detect the wrong file type.

-It's worth knowing that our tests are compiled to JS and then run in the temporary folder `component-tests`. 
+It's worth knowing that our tests are compiled to JS and then run in the temporary folder `component-tests`.

 ### Jest
 There is also further configuration for Jest in "test/jest". There is a jest config file which has some mostly standard configuration pieces, where the tests live, what environment variables are set etc. This is documented by Jest here: https://jestjs.io/docs/configuration

-There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies 
+There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies.
@@ -4,21 +4,41 @@ This document provides information on how to start developing Status App.

 # Getting Started

-To start developing start a shell for the platform you are interested in.
+To start developing clone the status-mobile repo in the directory of your choice. 
 ```
-make shell TARGET=android
+git clone https://github.com/status-im/status-mobile.git
 ```
-This step will take a while the first time as it will download all dependencies.

-# Development
+Then open a terminal and cd into this directory. 

-There are three steps necessary to start development, in this case for Android:
+```
+cd status-mobile
+```

-1. `make run-clojure` - Compiles Clojure into JavaScript, watches for changes on cljs files, and hot-reloads code in the app.
-2. `make run-android` or `make run-ios` - Builds the Android/iOS app, starts it on the device and starts metro bundler.
+Then build the clojure terminal 

-The first two will continue watching for changes and keep re-building the app. They need to be ready first.
-The last one will exit once the app is up and ready.
+```
+make run-clojure
+```
+
+note: ⚠️ This might take a while if this is your first time.
+
+This command installs `nix` and pulls in all the dependencies.
+Do answer with "Y" to all the prompts and press "Enter" when `nix` setup asks you to Acknowledge.
+This command builds the `jsbundle` and then compiles `Clojure` into `JavaScript`, watches for changes on `cljs` files, and hot-reloads code in the app.
+
+wait till you see the following message :
+
+```
+[:mobile] Build completed. (1801 files, 52 compiled, 0 warnings, 9.52s)
+```
+
+Once the clojure terminal is running you need to run the appropriate command next for your platform in a separate terminal :
+
+`make run-android` or `make run-ios`
+
+These commands will build the app, start a metro bundler and deploy the app on your simulator OR connected device (android only). For building and deploying to connected iPhones use `make run-ios-device` instead of `make run-ios`
+Also check [developing on a physical iOS Device](#Additional-requirements-for-developing-on-physical-ios-device).

 ## Simulators and Devices
 ### Android
@@ -45,13 +65,9 @@ Running `make run-ios` will target `iPhone 13` by default.

 If you need to run on any other simulator, you can specify the simulator type by adding the `SIMULATOR` flag:
 ```sh
-make run-ios SIMULATOR="iPhone 13"
+make run-ios SIMULATOR="iPhone 15"
 ```

-#### Running on a physical device
-
-Some manual steps are necessary for [developing on a physical iOS Device](#physical-ios-device).
-
 # Build release

 To build the app, you can simply run on of the following:
@@ -101,16 +117,15 @@ Steps:
 3. [Setup Git to sign commits](https://help.github.com/en/github/authenticating-to-github/signing-commits)
 4. [Setup GitHub to validate commits](https://help.github.com/en/github/authenticating-to-github/adding-a-new-gpg-key-to-your-github-account)

-## Physical iOS Device
+## Additional requirements for developing on Physical iOS Device

 To use a physical iPhone your device UDID must be added to provisioning profiles and your Apple account invited as Developer to Status team.

 1. [Get your UDID of your iPhone.](https://www.extentia.com/post/finding-the-udid-of-an-ios-device)
 2. Request from someone with access like @cammellos or @jakubgs to
-  - Add the UDID to development devices on Apple Developer Portal.
-  - Invite your Apple account to be Developer in Status team.
-3. Run a build in XCode using the project from `status-mobile/ios` directory.
-  - You might see error: `Select a development team in the Signing & Capabilities editor`
-  - Select `Status Research & Development GmbH` as the development team and rebuild again.
-
-Once build finishes Status should start on your iPhone with its logs in terminal running `make run-metro`.
+- Add the UDID to development devices on Apple Developer Portal.
+- Invite your Apple account to be Developer in Status team.
+3. Open XCode using the project from `status-mobile/ios` directory.
+- You might see error: `Select a development team in the Signing & Capabilities editor`
+- Select `Status Research & Development GmbH` as the development team.
+4. In a new terminal execute `make clean` and then `make xcode-clean` 
@@ -2,14 +2,12 @@

 ## Unit & integration tests

-To run tests:
+To run all tests:

 ```
 make test
 ```

-
-
 Also test watcher can be launched. It will re-run the entire test suite when any file is modified

 ```
@@ -51,18 +49,46 @@ Here I'm showing a terminal-only experience using Tmux (left pane Emacs, right p

 [2022-12-19 13-17.webm](https://user-images.githubusercontent.com/46027/208471199-1909c446-c82d-42a0-9350-0c15ca562713.webm)

-## Component tests
+## Component tests only

 To run tests:

 ```
-   make component-test
+make test-component
 ```

 Also test watcher can be launched. It will re-run the entire test suite when any file is modified

 ```
-   make component-test-watch
+make test-component-watch
 ```

 Check [component tests doc](./component-tests-overview.md) for more.
+
+## Unit tests only
+
+To run unit tests:
+
+```
+make test-unit
+```
+
+Also test watcher can be launched. It will re-run the entire test suite when any file is modified
+
+```
+make test-unit WATCH=true
+```
+
+## Integration tests only
+
+To run integration tests:
+
+```
+make test-integration
+```
+
+Also test watcher can be launched. It will re-run the entire test suite when any file is modified
+
+```
+make test-integration WATCH=true
+```
@@ -88,6 +88,7 @@ info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this
 Update yarn.lock file. In order to do this, perform the following steps on a clean `status-mobile` repo:
 ```
 cd status-mobile
+make shell
 yarn install
 ```
 and don't forget to commit updated `yarn.lock` together with `package.json`.
@@ -127,23 +128,3 @@ Status-mobile uses `shadow-cljs` for hot reloading changes and uses its own [rel

 ### Solution
 Open react native's [In-App Developer Menu](https://reactnative.dev/docs/debugging#accessing-the-in-app-developer-menu) and press "Disable Fast Refresh" or "Disable Hot Reloading"
-
-## App Crashes after few reloads
-
-### Cause
-For x86 CPU architecture Android Devices, Hermes is creating the issue and the app crashes after a few reloads.
-([Original Issue](https://github.com/status-im/status-mobile/issues/14031))
-
-<details>
-  <summary>How to Find CPU architecture</summary>
-
-  CPU architecture of android device can be found using
-  - `adb shell uname -m` or
-  - `adb shell getprop ro.product.cpu.abilist`
-
-</details>
-
-### Solution
-Disable Hermes while building the app
-
-`make run-android DISABLE_HERMES=true`
@@ -0,0 +1,254 @@
+# UI components coding guidelines
+
+> [!IMPORTANT]
+> React apps are made out of components. A component is a piece of the UI (user interface) that has its own logic and appearance. A component can be as small as a button, or as large as an entire screen.
+> React components are JavaScript functions that return markup
+> This document will provide best practices on how to write efficient React components in ClojureScript
+
+
+At the time of creating the Status app, the Reagent library was a solid choice. Back then, hooks didn't exist, and there weren't any libraries providing effective global state management. After Reagent's emergence, another library called Re-frame built upon Reagent. Together, they offered powerful tools for developing React applications with ClojureScript. However, as React evolved, significant changes occurred. Class components, utilized in Reagent, became deprecated. Instead, functional components and hooks emerged for state management. In Status 2.0, we began incorporating more functional components and hooks, resulting in a blend of both approaches. To simplify matters and reduce confusion, we opted to transition to functional components and hooks for local state management.
+
+BEFORE:
+```clojure
+(defn- view-internal
+  [_ _]
+  (let [pressed? (reagent/atom false)]
+    (fn
+      [{:keys [theme on-press on-long-press icon]}]
+      [rn/pressable
+       {:style               (style/main @pressed? theme)
+        :on-press            on-press
+        :on-press-in         #(reset! pressed? true)
+        :on-press-out        #(reset! pressed? nil)
+        :on-long-press       on-long-press}
+       [quo.icons/icon icon]])))
+
+(def view (theme/with-theme view-internal))
+```
+
+NOW:
+```clojure
+(defn view
+  [{:keys [on-press on-long-press icon]}]
+  (let [[pressed? set-pressed] (rn/use-state false)
+        theme                  (theme/use-theme-value)
+        on-press-in            (rn/use-callback #(set-pressed true))
+        on-press-out           (rn/use-callback #(set-pressed nil))]
+    [rn/pressable
+     {:style               (style/main pressed? theme)
+      :on-press            on-press
+      :on-press-in         on-press-in
+      :on-press-out        on-press-out
+      :on-long-press       on-long-press}
+     [quo.icons/icon icon]]))
+```
+
+
+- We no longer need to create an anonymous function for rendering. This removes unnecessary confusion and the need for specific knowledge on how it works and why it was needed.
+- `rn/use-state` is used instead of `reagent/atom`
+- State values no longer need to be dereferenced; they are accessible as regular symbols. This eliminates a common bug where the "@" symbol was inadvertently omitted.
+- `theme/with-theme` wrapper is not needed anymore, `(theme/use-theme-value)` hook can be used directly in the components
+- `:f>` not needed anymore, all components are functional by default
+- `rn/use-callback` hook should be used for anon callback functions
+
+> [!IMPORTANT]
+> DO NOT USE anon functions directly in the props
+ 
+BAD
+```clojure
+(defn view
+  []
+  (let [[pressed? set-pressed] (rn/use-state false)]
+    [rn/pressable
+     {:style               (style/main pressed?)
+      :on-press-in         #(set-pressed true)
+      :on-press-out        #(set-pressed nil)}]))
+```
+
+GOOD:
+```clojure
+(defn view
+  []
+  (let [[pressed? set-pressed] (rn/use-state false)
+        on-press-in            (rn/use-callback #(set-pressed true))
+        on-press-out           (rn/use-callback #(set-pressed nil))]
+    [rn/pressable
+     {:style               (style/main pressed?)
+      :on-press-in         on-press-in
+      :on-press-out        on-press-out}]))
+```
+
+## Global state and subscriptions
+
+For global state management, we utilize Re-frame subscriptions. They can be likened to React state. To obtain the state, `(rf/sub [])` is employed, and to modify it, `(rf/dispatch [])` is utilized. However, they update components in a similar manner to React states.
+
+```clojure
+(defn view
+  [{:keys [selected-tab]}]
+  (let [collectible-list (rf/sub [:wallet/all-collectibles])
+        on-collectible-press (rn/use-callback
+                              (fn [{:keys [id]}]
+                               (rf/dispatch [:wallet/get-collectible-details id])))]
+    [rn/view {:style style/container}
+     (case selected-tab
+       :assets       [assets/view]
+       :collectibles [collectibles/view {:collectibles         collectible-list
+                                         :on-collectible-press on-collectible-press}])
+       [activity/view]]))
+```
+
+## Regular atoms
+
+In certain instances, components utilized regular atoms; however, they should now be used with `rn/use-ref-atom`
+
+BEFORE:
+```clojure
+(defn view
+  []
+  (let [focused? (atom false)]
+    (fn []
+      (let [on-clear #(reset! status (if @focused? :active :default))
+            on-focus #(reset! focused? true)
+            on-blur  #(reset! focused? false)]))))
+```
+
+NOW:
+```clojure
+(defn view
+  []
+  (let [focused? (rn/use-ref-atom false)
+        on-clear (rn/use-callback #(set-status (if @focused? :active :default)))
+        on-focus (rn/use-callback #(reset! focused? true))
+        on-blur  (rn/use-callback #(reset! focused? false))]))
+```
+
+## Effects
+
+LIFECYCLE:
+
+```clojure
+(defn view
+  [{:keys []}]
+  (let [opacity (reanimated/use-shared-value 0)]
+    (rn/use-mount #(reanimated/animate opacity 1))
+    [rn/view
+     {:style (style/opacity opacity)}]))
+```
+
+```clojure
+(defn view
+  [{:keys []}]
+  (let []
+    (rn/use-unmount #(rn/dispatch [:unmounted]))
+    [rn/view]))
+```
+
+> [!IMPORTANT]
+> Effects should NOT be utilized as a response to state changes for modifying logic. If you're unsure how to achieve this without using effects, please consult the team in the general chat. There may be instances where using effects is appropriate, so we can explore a solution together and enhance our guidelines.
+
+BAD:
+```clojure
+(defn f-zoom-button
+  [{:keys [selected? current-zoom]}]
+  (let [size (reanimated/use-shared-value (if selected? 37 25))]
+    (rn/use-effect #(reanimated/animate size (if selected? 37 25)) [current-zoom])
+    [rn/touchable-opacity
+     {:style (style/zoom-button-container size)}]))
+```
+
+BAD:
+
+```clojure
+(defn view
+  [collectible-list (rf/sub [:wallet/all-collectibles])]
+  (let []
+    (rn/use-effect #(rn/dispatch [:all-collectibles-changed]) [collectible-list])
+    [rn/view]))
+```
+
+Instead `:all-collectibles-changed` should be used in the handler which changes `collectible-list` state
+
+
+
+## Performance tips
+
+To begin with, we need to understand that there are two distinct stages for a component: creation and update. React creates a render tree, a UI tree, composed of the rendered components.
+
+![react_tree.png](react_tree.png)
+
+### Component creation
+
+For component creation, the most critical factor is the number of elements involved, so we should strive to minimize them. For instance, it's advisable to avoid using unnecessary wrappers or containers.
+
+BAD:
+
+```clojure
+(defn view
+  []
+  (let []
+    [rn/view {:style {:padding-top 20}}
+     [quo/button]]))
+```
+
+GOOD:
+```clojure
+(defn view
+  []
+  (let []
+    [quo/button {:container-style {:padding-top 20}}]))
+```
+
+### Component updates
+
+For component updates, it's crucial to recognize that React will invoke the function where state is utilized. Therefore, if you utilize state in the root component, React will execute the root function and re-render the entire root component along with all its children (unless optimizations like memoization are implemented).
+
+BAD:
+
+```clojure
+(defn component
+  [{:keys [label]}]
+  (let []
+    [rn/text label]))
+
+(defn component2
+  [{:keys [label2]}]
+  (let []
+    [rn/text label2]))
+
+(defn screen
+  []
+  (let [screen-params (rf/sub [:screen-params])]
+    [component screen-params]
+    [component1]
+    [component2 screen-params]
+    [component3]
+    [rn/view {:padding-top 20}
+     [quo/button]]))
+```
+
+Here, we have lost control over the `screen-params` map. It can contain any data, and if any field within this map changes, the entire screen function will be executed, resulting in the re-rendering of both `component` and `component2`.
+
+GOOD:
+```clojure
+(defn component
+  []
+  (let [label (rf/sub [:screen-params-label])]
+    [rn/text label]))
+
+(defn component2
+  []
+  (let [label2 (rf/sub [:screen-params-label2])]
+    [rn/text label2]))
+
+(defn screen
+  []
+  (let []
+    [component]
+    [component1]
+    [component2]
+    [component3]
+    [rn/view {:padding-top 20}
+     [quo/button]]))
+```
+
+So, now the screen component function will never be invoked, and `component` and `component2` will be re-rendered only when `label` or `label2` have changed.
@@ -1,4 +1,5 @@
 # This file contains the fastlane.tools configuration
+
 # You can find the documentation at https://docs.fastlane.tools
 #
 # For a list of all available actions, check out
@@ -96,7 +97,7 @@ end
 #    if false - read list of devices from AppStoreConnect, and upgrade the provisioning profiles from it
 # `pr_build`:
 #    if true  - uses StatusImPR scheme and postfixed app id with `.pr` to build an app, which can be used in parallel with release
-#    if false - uses StatusIm scheme to build the release app 
+#    if false - uses StatusIm scheme to build the release app

 def build_ios_adhoc(readonly: false, pr_build: false)
  # PR builds should appear as a separate App on iOS
@@ -123,7 +124,7 @@ def build_ios_adhoc(readonly: false, pr_build: false)
    export_method: 'ad-hoc',
    output_name: 'StatusIm',
    output_directory: 'status-ios',
-    buildlog_path: 'ios/logs',
+    buildlog_path: 'logs',
    export_options: {
      signingStyle: 'manual',
      provisioningProfiles: {
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {

 /* Begin PBXBuildFile section */
@@ -542,7 +542,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env sh";
-			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ../logs/react-native-xcode.log 2>&1";
 		};
 		28606042DA81A750949525E4 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -578,7 +578,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env sh";
-			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ../logs/react-native-xcode.log 2>&1";
 		};
 		3AAD2AD724A3A60E0075D594 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -592,7 +592,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
 		};
 		523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -716,7 +716,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = "/usr/bin/env sh";
-			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
+			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ../logs/set_xcode_version.log 2>&1";
 		};
 /* End PBXShellScriptBuildPhase section */

@@ -133,7 +133,7 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
+	<false/>
 	<key>com.apple.developer.nfc.readersession.iso7816.select-identifiers</key>
 	<array>
 		<string>A00000080400010101</string>
@@ -1,14 +0,0 @@
-# Description
-
-This directory is the destination of logs created by Fastlane and React Native Xcode script.
-
-# Logs
-
-* `react-native-xcode.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`.
-  - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj`.
-* `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/).
-  - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.
-
-# CI
-
-These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`.
@@ -0,0 +1,27 @@
+# Description
+
+This directory is the destination of logs created during build time of debug builds and logs created by Fastlane on CI.
+
+# Logs
+
+* `xcrun_device_install.log` - Output from `status-mobile/scripts/run-ios-device.sh`.
+    - Created by redirecting output of `xcrun simctl install "$UDID" "$APP_PATH"`.
+* `xcrun_device_process_launch.log` - Output from `status-mobile/scripts/run-ios-device.sh`.
+    - Created by specifying `--json-output` flag for `xcrun devicectl device process launch --no-activate --verbose --device "${DEVICE_UUID}" "${INSTALLATION_URL}"`.
+* `xcrun_device_process_resume.log` - Output from `status-mobile/scripts/run-ios-device.sh`.
+    - Created by redirecting output of `xcrun devicectl device process resume --device "${DEVICE_UUID}" --pid "${STATUS_PID}"`.
+* `adb_install.log` - Output from `scripts/run-android.sh`.
+    - Created by redirecting output of `adb install -r ./result/app-debug.apk`.
+* `adb_shell_monkey.log` - Output from `status-mobile/scripts/run-android.sh`.
+    - Created by redirecting output of `adb shell monkey -p im.status.ethereum.debug 1 >`.
+* `ios_simulators_list.log` - Output from `status-mobile/scripts/run-ios.sh`.
+    - Created by redirecting output of `xcrun simctl list devices -j`.
+
+# CI
+
+These log files are uploaded to Jenkins as CI job artifacts on failure using `archiveArtifacts`.
+
+* `react-native-xcode.log` - Output from `node_modules/react-native/scripts/react-native-xcode.sh`.
+  - Created by redirecting output of `shellScript` in `ios/StatusIm.xcodeproj/project.pbxproj`.
+* `Status PR-StatusImPR.log - Created by [Fastlane Gym](https://docs.fastlane.tools/actions/gym/).
+  - Configred via [`Fastfile`](../Fastfile) using `buildlog_path` argument for `build_ios_app`.
@@ -342,4 +342,14 @@ public class AccountManager extends ReactContextBaseJavaModule {
        final String keyStoreDir = this.utils.getKeyStorePath(keyUID);
        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deleteMultiaccount(keyUID, keyStoreDir), callback);
    }
+
+    @ReactMethod
+    public void getRandomMnemonic(final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.getRandomMnemonic(), callback);
+    }
+
+    @ReactMethod
+    public void createAccountFromMnemonicAndDeriveAccountsForPaths(final String mnemonic, final Callback callback) throws JSONException {
+        this.utils.executeRunnableStatusGoMethod(() -> Statusgo.createAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic), callback);
+    }
 }
@@ -214,4 +214,20 @@ RCT_EXPORT_METHOD(logout) {
        NSLog(@"%@", result);
 }

+RCT_EXPORT_METHOD(getRandomMnemonic:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"GetRandomMnemonic() method called");
+#endif
+    NSString *result = StatusgoGetRandomMnemonic();
+    callback(@[result]);
+}
+
+RCT_EXPORT_METHOD(createAccountFromMnemonicAndDeriveAccountsForPaths:(NSString *)mnemonic callback:(RCTResponseSenderBlock)callback) {
+#if DEBUG
+    NSLog(@"createAccountFromMnemonicAndDeriveAccountsForPaths() method called");
+#endif
+    NSString *result = StatusgoCreateAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic);
+    callback(@[result]);
+}
+
@end
@@ -1888,6 +1888,36 @@ void _InitLogging(const FunctionCallbackInfo<Value>& args) {
    delete c;
 }

+void _RestoreAccountAndLogin(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 RestoreAccountAndLogin")));
+		return;
+	}
+
+	// Check the argument types
+
+	if (!args[0]->IsString()) {
+		isolate->ThrowException(Exception::TypeError(
+			String::NewFromUtf8Literal(isolate, "Wrong argument type for 'RestoreAccountAndLogin'")));
+		return;
+	}
+
+	String::Utf8Value arg0Obj(isolate, args[0]->ToString(context).ToLocalChecked());
+	char *arg0 = *arg0Obj;
+
+	// Call exported Go function, which returns a C string
+	char *c = RestoreAccountAndLogin(arg0);
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+}
+

 void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountGenerateAndDeriveAddresses", _MultiAccountGenerateAndDeriveAddresses);
@@ -1945,6 +1975,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "connectionChange", _ConnectionChange);
 	NODE_SET_METHOD(exports, "pollSignal", _PollSignal);
 	NODE_SET_METHOD(exports, "initLogging", _InitLogging);
+	NODE_SET_METHOD(exports, "restoreAccountAndLogin", _RestoreAccountAndLogin);
 }

 NODE_MODULE(NODE_GYP_MODULE_NAME, init)
@@ -90,20 +90,20 @@
  },

  {
-    "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
+    "path": "cider/cider-nrepl/0.31.0/cider-nrepl-0.31.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "5ae0efd9377a5e60c084bdaf4a2ce094f759ce23",
-      "sha256": "0drxf9nm23i1pcgrkwbcr09msq37csilzww38709add0hz8spjhq"
+      "sha1": "1f28a4a834a7a46cf24def971b1a705a6795c73a",
+      "sha256": "0h4pyzy8rzzh567khvimw2cs8jr640kqxgaxvbfx1s5yfp56fka2"
    }
  },

  {
-    "path": "cider/piggieback/0.4.1/piggieback-0.4.1",
+    "path": "cider/piggieback/0.5.2/piggieback-0.5.2",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
-      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
+      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
+      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
    }
  },

@@ -251,15 +251,6 @@
    }
  },

-  {
-    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
-      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
-    }
-  },
-
  {
    "path": "com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0",
    "host": "https://repo1.maven.org/maven2",
@@ -306,11 +297,11 @@
  },

  {
-    "path": "com/google/javascript/closure-compiler-unshaded/v20230411/closure-compiler-unshaded-v20230411",
+    "path": "com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "2f5d7ab921f9cc07ffeb4e1c0f156f164c650eeb",
-      "sha256": "0gphdrrhr88bcqa1scndachvhbayh7m11zm9hcsmvzn9bw72pabw"
+      "sha1": "0a2498a4d45bf5896042f31da0cd30c5e7b415af",
+      "sha256": "0jvgqq0gnvm4jw2zac4677ds05klvsjalszdzcq3nw8g7fjyjv2x"
    }
  },

@@ -333,38 +324,11 @@
  },

  {
-    "path": "commons-codec/commons-codec/1.15/commons-codec-1.15",
+    "path": "com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d",
-      "sha256": "0qzd8v96j4x7jjcfpvvdh9ar1xhwxpxi2rh51nzhj0br7bbgdsdk"
-    }
-  },
-
-  {
-    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
-      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
-    }
-  },
-
-  {
-    "path": "commons-io/commons-io/2.11.0/commons-io-2.11.0",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "a2503f302b11ebde7ebc3df41daebe0e4eea3689",
-      "sha256": "020946yakki3qzc652arfndzi594drxanidz9bawbb6vhxnjy6wn"
-    }
-  },
-
-  {
-    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
-      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
+      "sha1": "c9ad4a0850ab676c5c64461a05ca524cdfff59f1",
+      "sha256": "170rflxnqnah0265ik2aylmxkshyqbf2zas9bp2l32xqj9l6jsaf"
    }
  },

@@ -404,6 +368,42 @@
    }
  },

+  {
+    "path": "commons-codec/commons-codec/1.15/commons-codec-1.15",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d",
+      "sha256": "0qzd8v96j4x7jjcfpvvdh9ar1xhwxpxi2rh51nzhj0br7bbgdsdk"
+    }
+  },
+
+  {
+    "path": "commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "f95188e3d372e20e7328706c37ef366e5d7859b0",
+      "sha256": "1xyyl54sfxsdcwxdyq6b0azmr31b4dwqns850jjkw9a9dwrh5v54"
+    }
+  },
+
+  {
+    "path": "commons-io/commons-io/2.11.0/commons-io-2.11.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "a2503f302b11ebde7ebc3df41daebe0e4eea3689",
+      "sha256": "020946yakki3qzc652arfndzi594drxanidz9bawbb6vhxnjy6wn"
+    }
+  },
+
+  {
+    "path": "compojure/compojure/1.5.2/compojure-1.5.2",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "0b5258d0616ffc5f64c2b6d95f09de56d24df439",
+      "sha256": "1s2k05lwnlm9a66mxnsss437i9gp70dny8y2rlfkl090s6mdqsaf"
+    }
+  },
+
  {
    "path": "crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1",
    "host": "https://repo.clojars.org",
@@ -449,6 +449,15 @@
    }
  },

+  {
+    "path": "funcool/promesa/11.0.678/promesa-11.0.678",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "0ee1690ba74b2609c2d85b51edacad13046a18e2",
+      "sha256": "1wif8nwdbpchwg56fz47ymjnflmva0fzy0bw1s6bacnac472pmza"
+    }
+  },
+
  {
    "path": "hiccup/hiccup/1.0.5/hiccup-1.0.5",
    "host": "https://repo.clojars.org",
@@ -504,11 +513,11 @@
  },

  {
-    "path": "io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final",
+    "path": "io/undertow/undertow-core/2.3.10.Final/undertow-core-2.3.10.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "78650b4029dd9280c4769d9425b5559f12cb83bf",
-      "sha256": "1brpkd2l98byf76jga6hj5drv5sj2d93lxlq2xz0rxpqyqas1xm4"
+      "sha1": "96d1d5ca6406a75a285b95ea8f4b39e0fb2d707e",
+      "sha256": "1s1m5hfhmfr7jsp4bn4c6fhdbgiz72mz0a96494nyhfa0b4lql8l"
    }
  },

@@ -594,11 +603,11 @@
  },

  {
-    "path": "nrepl/nrepl/1.0.0/nrepl-1.0.0",
+    "path": "nrepl/nrepl/0.9.0/nrepl-0.9.0",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "f47774c43493efdc879d36b95ebd67ea0d9c890a",
-      "sha256": "1fx5ssmixgqmklliw0ng8fjz41kkhys56x8dbwv9yqrfzws9f2x3"
+      "sha1": "49beada131959f08f9a20899affbd1b10c03a668",
+      "sha256": "1phak0479s27ffw9wzz7pi8cqqs6ipsm15dhgw9szxxcfhx529qa"
    }
  },

@@ -611,15 +620,6 @@
    }
  },

-  {
-    "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "b875cd48a0bc955ae9c5c477ad991e1f26fb24d2",
-      "sha256": "0m07pifkdpwghpp8wvqh14sbxazmjbkkpsfakw6ixq5apfdvih48"
-    }
-  },
-
  {
    "path": "org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11",
    "host": "https://repo1.maven.org/maven2",
@@ -630,11 +630,11 @@
  },

  {
-    "path": "org/babashka/sci/0.7.38/sci-0.7.38",
-    "host": "https://repo.clojars.org",
+    "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
+    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "ef2d8c74065b9a7d685a11bff017676db308a923",
-      "sha256": "04pkxwcgkd1p4f4rszsr6pp18fl0vni1az47a390llrhyyrjcckn"
+      "sha1": "b875cd48a0bc955ae9c5c477ad991e1f26fb24d2",
+      "sha256": "0m07pifkdpwghpp8wvqh14sbxazmjbkkpsfakw6ixq5apfdvih48"
    }
  },

@@ -647,6 +647,15 @@
    }
  },

+  {
+    "path": "org/babashka/sci/0.7.38/sci-0.7.38",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "ef2d8c74065b9a7d685a11bff017676db308a923",
+      "sha256": "04pkxwcgkd1p4f4rszsr6pp18fl0vni1az47a390llrhyyrjcckn"
+    }
+  },
+
  {
    "path": "org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0",
    "host": "https://repo1.maven.org/maven2",
@@ -737,15 +746,6 @@
    }
  },

-  {
-    "path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "533ce2bdbb7925db781449abb6527af1e6c5e782",
-      "sha256": "0js19lw8bp9gym3pn47h867vhf65j18qc6x1pfn883vkwyasm18l"
-    }
-  },
-
  {
    "path": "org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541",
    "host": "https://repo1.maven.org/maven2",
@@ -755,6 +755,15 @@
    }
  },

+  {
+    "path": "org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "533ce2bdbb7925db781449abb6527af1e6c5e782",
+      "sha256": "0js19lw8bp9gym3pn47h867vhf65j18qc6x1pfn883vkwyasm18l"
+    }
+  },
+
  {
    "path": "org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0",
    "host": "https://repo1.maven.org/maven2",
@@ -782,15 +791,6 @@
    }
  },

-  {
-    "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "692882a35d7b50947d6e4852fba8a51d8d5e3646",
-      "sha256": "08fzw3srrppgq1d11sh1ghnyvi24ixa10kbqsncc7xyx7fybcs0k"
-    }
-  },
-
  {
    "path": "org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2",
    "host": "https://repo1.maven.org/maven2",
@@ -800,6 +800,15 @@
    }
  },

+  {
+    "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "692882a35d7b50947d6e4852fba8a51d8d5e3646",
+      "sha256": "08fzw3srrppgq1d11sh1ghnyvi24ixa10kbqsncc7xyx7fybcs0k"
+    }
+  },
+
  {
    "path": "org/clojure/tools.cli/1.0.206/tools.cli-1.0.206",
    "host": "https://repo1.maven.org/maven2",
@@ -828,11 +837,11 @@
  },

  {
-    "path": "org/clojure/tools.reader/1.3.6/tools.reader-1.3.6",
+    "path": "org/clojure/tools.reader/1.3.7/tools.reader-1.3.7",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "927809dcb44fa726e4969d993e3e733636d95ebb",
-      "sha256": "1q5q7fmshybvp55f6qys8i5sbzfaix5v9f9b55dkbhv55hgv7l8i"
+      "sha1": "c60dfd3d79cbc5ec6264ba45c14b8d4c9b6708b2",
+      "sha256": "1mr0qx3gw1myfls07vrx3arwsi5n95b2lwk74ijpj0z3lzpzlj7m"
    }
  },

@@ -846,38 +855,38 @@
  },

  {
-    "path": "org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final",
+    "path": "org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "40fd4d696c55793e996d1ff3c475833f836c2498",
-      "sha256": "1f7f4kjn3v6vibhgsr3k8hl0r2xq0c2rbcl82dx0bqg5jdyqgzlf"
+      "sha1": "c4bd7e12a745c0e7f6cf98c45cdcdf482fd827ea",
+      "sha256": "0jdcziqbdzmah981zv3q88k2zrnclr2h1k3h3vjn002m9p54qchb"
    }
  },

  {
-    "path": "org/jboss/threads/jboss-threads/3.1.0.Final/jboss-threads-3.1.0.Final",
+    "path": "org/jboss/threads/jboss-threads/3.5.0.Final/jboss-threads-3.5.0.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "9b260c0302f637a84a52d3d118214a3c59217615",
-      "sha256": "0yc0p71y7yjhqjhkvqqi9xqgljavp3aslnik2k7dppbxnkrnlff9"
+      "sha1": "dd23d4788b3eafe9597ef3fe028e46ceb293ba8d",
+      "sha256": "1cchp54dw1578my27siim3h5jbf240aq8q6xd3z2b1ajgxxbcl71"
    }
  },

  {
-    "path": "org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final",
+    "path": "org/jboss/xnio/xnio-api/3.8.8.Final/xnio-api-3.8.8.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "e2c29acf42ac6f42c34f0b74ba089e3f3d1b2394",
-      "sha256": "041qnvb74bkgmfxyd23vdl26il55cmfbhi6a4bm3fcmyrpapjfjl"
+      "sha1": "1ba9c8b9a8dea1c6cd656155943e6d4c2c631fa7",
+      "sha256": "0wvqdcbardi55l77aw5404qgw70384hw155xvc66shn7l6z8h6bh"
    }
  },

  {
-    "path": "org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final",
+    "path": "org/jboss/xnio/xnio-nio/3.8.8.Final/xnio-nio-3.8.8.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "90c57dcf7f8c846b4da331d0e6e048c39842c92a",
-      "sha256": "1zndnb5648wqw23gj80zjqk3yd8gq6grqhz9n4zrcqixx1z586jf"
+      "sha1": "a5d2faf8d02e0a0bb9e9eabca8e38173cb640331",
+      "sha256": "0pxw2iv1q1yzk39knc650rg4vflsyjzhf07mwm2s5aqn5h82sk3i"
    }
  },

@@ -909,11 +918,20 @@
  },

  {
-    "path": "org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36",
+    "path": "org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "6c62681a2f655b49963a5983b8b0950a6120ae14",
-      "sha256": "1h512ry8g0nriazg3dqzs6s96502a77drw8vq26nfya97rg5gvyk"
+      "sha1": "7cf2726fdcfbc8610f9a71fb3ed639871f315340",
+      "sha256": "0v1b7iydpnh2rvyzqvqbqm19vr2qva8icq84690bppnpr06r6608"
+    }
+  },
+
+  {
+    "path": "org/slf4j/slf4j-nop/2.0.9/slf4j-nop-2.0.9",
+    "host": "https://repo1.maven.org/maven2",
+    "jar": {
+      "sha1": "fa0627049304bf501bf6a0e4d1416bcaec9a72a9",
+      "sha256": "10vdg9qkailjbzmf5mfnv328675swmnf1x3g9v7ymhxs29xkc4jn"
    }
  },

@@ -927,11 +945,11 @@
  },

  {
-    "path": "org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final",
+    "path": "org/wildfly/common/wildfly-common/1.5.4.Final/wildfly-common-1.5.4.Final",
    "host": "https://repo1.maven.org/maven2",
    "jar": {
-      "sha1": "8eba40cfe86bcfcc223551e75201e6e7574c7c36",
-      "sha256": "17rkkm9dqbxdzpamwl9jr8z285awsj6hzpavzmc87wcz9469hp5b"
+      "sha1": "735ceee5616d5143bac1bc740e444697073c002f",
+      "sha256": "0sp48y3q7bmp3bjb7a6fpz8gb7ssizvxlw5wdv2xwa6mifpkrnlz"
    }
  },

@@ -944,15 +962,6 @@
    }
  },

-  {
-    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
-      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
-    }
-  },
-
  {
    "path": "re-com/re-com/2.8.0/re-com-2.8.0",
    "host": "https://repo.clojars.org",
@@ -962,15 +971,6 @@
    }
  },

-  {
-    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
-      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
-    }
-  },
-
  {
    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
    "host": "https://repo.clojars.org",
@@ -998,6 +998,24 @@
    }
  },

+  {
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
+    }
+  },
+
+  {
+    "path": "refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1",
+    "host": "https://repo.clojars.org",
+    "jar": {
+      "sha1": "f949af92dd1d6fef59d7447bd0cb62118e34eca1",
+      "sha256": "0dml9yvjmji6xk2sk3cdmkvvnh13rw29szxxl363hap8yg28xcs1"
+    }
+  },
+
  {
    "path": "ring-cors/ring-cors/0.1.8/ring-cors-0.1.8",
    "host": "https://repo.clojars.org",
@@ -1035,11 +1053,11 @@
  },

  {
-    "path": "thheller/shadow-cljs/2.25.0/shadow-cljs-2.25.0-aot",
+    "path": "thheller/shadow-cljs/2.26.2/shadow-cljs-2.26.2-aot",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "013921db91ce4a3616aec9c72c1832a014a0fece",
-      "sha256": "0ks380z7h8i2ylirvjgmlicq9jjpz9w71gjv521h4xs5fb273cl0"
+      "sha1": "ab6b31649cb03e352369698781207db4f6da6d5f",
+      "sha256": "0mh28nykpillkym7hvplrr7vy5hn6a2ymafyf4yfl5y2kfx4yq42"
    }
  },

@@ -1053,11 +1071,11 @@
  },

  {
-    "path": "thheller/shadow-undertow/0.3.1/shadow-undertow-0.3.1",
+    "path": "thheller/shadow-undertow/0.3.3/shadow-undertow-0.3.3",
    "host": "https://repo.clojars.org",
    "jar": {
-      "sha1": "9be444bea4037bb80b451cc52a8e80359c4c45be",
-      "sha256": "174s2rdxvp7d4jg9kvzjadps42bdsbi05rs2pjy5i0ssq9n23zwa"
+      "sha1": "ba377c3b70fd942b3ca7e38f055412a441626711",
+      "sha256": "10w2slj4znm93j0qq3ldj9hj0i7a50vbnmn6kv8i77fakikdjc48"
    }
  },

@@ -8,8 +8,8 @@ borkdude/edamame/1.3.23/edamame-1.3.23.jar
 borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cheshire/cheshire/5.11.0/cheshire-5.11.0.jar
-cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
-cider/piggieback/0.4.1/piggieback-0.4.1.jar
+cider/cider-nrepl/0.31.0/cider-nrepl-0.31.0.jar
+cider/piggieback/0.5.2/piggieback-0.5.2.jar
 clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07.jar
 cljs-bean/cljs-bean/1.9.0/cljs-bean-1.9.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
@@ -26,35 +26,36 @@ com/github/javaparser/javaparser-core/3.25.3/javaparser-core-3.25.3.jar
 com/google/auto/value/auto-value-annotations/1.6/auto-value-annotations-1.6.jar
 com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 com/google/code/gson/gson/2.9.1/gson-2.9.1.jar
-com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
 com/google/errorprone/error_prone_annotations/2.15.0/error_prone_annotations-2.15.0.jar
 com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
 com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar
 com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
 com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar
-com/google/javascript/closure-compiler-unshaded/v20230411/closure-compiler-unshaded-v20230411.jar
+com/google/javascript/closure-compiler-unshaded/v20230802/closure-compiler-unshaded-v20230802.jar
 com/google/protobuf/protobuf-java/3.21.12/protobuf-java-3.21.12.jar
 com/google/re2j/re2j/1.3/re2j-1.3.jar
-commons-codec/commons-codec/1.15/commons-codec-1.15.jar
-commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
-commons-io/commons-io/2.11.0/commons-io-2.11.0.jar
-compojure/compojure/1.5.2/compojure-1.5.2.jar
+com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar
 com/taoensso/encore/3.68.0/encore-3.68.0.jar
 com/taoensso/timbre/6.3.1/timbre-6.3.1.jar
 com/taoensso/truss/1.11.0/truss-1.11.0.jar
 com/taoensso/tufte/2.6.3/tufte-2.6.3.jar
+commons-codec/commons-codec/1.15/commons-codec-1.15.jar
+commons-fileupload/commons-fileupload/1.4/commons-fileupload-1.4.jar
+commons-io/commons-io/2.11.0/commons-io-2.11.0.jar
+compojure/compojure/1.5.2/compojure-1.5.2.jar
 crypto-equality/crypto-equality/1.0.1/crypto-equality-1.0.1.jar
 crypto-random/crypto-random/1.2.1/crypto-random-1.2.1.jar
 day8/re-frame/test/0.1.5/test-0.1.5.jar
 expound/expound/0.9.0/expound-0.9.0.jar
 fipp/fipp/0.6.26/fipp-0.6.26.jar
+funcool/promesa/11.0.678/promesa-11.0.678.jar
 hiccup/hiccup/1.0.5/hiccup-1.0.5.jar
 http-kit/http-kit/2.2.0/http-kit-2.2.0.jar
 instaparse/instaparse/1.4.0/instaparse-1.4.0.jar
 io/aviso/pretty/1.4.4/pretty-1.4.4.jar
 io/methvin/directory-watcher/0.17.1/directory-watcher-0.17.1.jar
 io/replikativ/datalog-parser/0.2.25/datalog-parser-0.2.25.jar
-io/undertow/undertow-core/2.2.4.Final/undertow-core-2.2.4.Final.jar
+io/undertow/undertow-core/2.3.10.Final/undertow-core-2.3.10.Final.jar
 javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar
 javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
 javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar
@@ -64,12 +65,12 @@ mvxcvi/arrangement/2.1.0/arrangement-2.1.0.jar
 net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
 net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
 nrepl/bencode/1.1.0/bencode-1.1.0.jar
-nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
+nrepl/nrepl/0.9.0/nrepl-0.9.0.jar
 nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
-org/apache/ant/ant/1.10.11/ant-1.10.11.jar
 org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
-org/babashka/sci/0.7.38/sci-0.7.38.jar
+org/apache/ant/ant/1.10.11/ant-1.10.11.jar
 org/babashka/sci.impl.types/0.0.2/sci.impl.types-0.0.2.jar
+org/babashka/sci/0.7.38/sci-0.7.38.jar
 org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar
 org/clojure/clojure/1.11.1/clojure-1.11.1.jar
 org/clojure/clojurescript/1.11.60/clojurescript-1.11.60.jar
@@ -80,41 +81,42 @@ org/clojure/core.rrb-vector/0.1.2/core.rrb-vector-0.1.2.jar
 org/clojure/core.specs.alpha/0.2.62/core.specs.alpha-0.2.62.jar
 org/clojure/data.json/2.4.0/data.json-2.4.0.jar
 org/clojure/data.priority-map/1.1.0/data.priority-map-1.1.0.jar
-org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
 org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
+org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
 org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0.jar
 org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar
 org/clojure/test.check/1.1.1/test.check-1.1.1.jar
-org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0.jar
 org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
+org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0.jar
 org/clojure/tools.cli/1.0.206/tools.cli-1.0.206.jar
 org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
-org/clojure/tools.reader/1.3.6/tools.reader-1.3.6.jar
+org/clojure/tools.reader/1.3.7/tools.reader-1.3.7.jar
 org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar
-org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar
-org/jboss/threads/jboss-threads/3.1.0.Final/jboss-threads-3.1.0.Final.jar
-org/jboss/xnio/xnio-api/3.8.0.Final/xnio-api-3.8.0.Final.jar
-org/jboss/xnio/xnio-nio/3.8.0.Final/xnio-nio-3.8.0.Final.jar
+org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar
+org/jboss/threads/jboss-threads/3.5.0.Final/jboss-threads-3.5.0.Final.jar
+org/jboss/xnio/xnio-api/3.8.8.Final/xnio-api-3.8.8.Final.jar
+org/jboss/xnio/xnio-nio/3.8.8.Final/xnio-nio-3.8.8.Final.jar
 org/jspecify/jspecify/0.2.0/jspecify-0.2.0.jar
 org/msgpack/msgpack/0.6.12/msgpack-0.6.12.jar
 org/ow2/asm/asm/9.4/asm-9.4.jar
-org/slf4j/slf4j-api/1.7.36/slf4j-api-1.7.36.jar
+org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
+org/slf4j/slf4j-nop/2.0.9/slf4j-nop-2.0.9.jar
 org/wildfly/client/wildfly-client-config/1.0.1.Final/wildfly-client-config-1.0.1.Final.jar
-org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
+org/wildfly/common/wildfly-common/1.5.4.Final/wildfly-common-1.5.4.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
-reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
-refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
+reagent/reagent/1.2.0/reagent-1.2.0.jar
+refactor-nrepl/refactor-nrepl/3.9.1/refactor-nrepl-3.9.1.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.2.0/ring-codec-1.2.0.jar
 ring/ring-core/1.9.6/ring-core-1.9.6.jar
 thheller/shadow-client/1.3.3/shadow-client-1.3.3.jar
-thheller/shadow-cljs/2.25.0/shadow-cljs-2.25.0-aot.jar
+thheller/shadow-cljs/2.26.2/shadow-cljs-2.26.2-aot.jar
 thheller/shadow-cljsjs/0.0.22/shadow-cljsjs-0.0.22.jar
-thheller/shadow-undertow/0.3.1/shadow-undertow-0.3.1.jar
+thheller/shadow-undertow/0.3.3/shadow-undertow-0.3.3.jar
 thheller/shadow-util/0.7.0/shadow-util-0.7.0.jar
 tigris/tigris/0.1.2/tigris-0.1.2.jar
@@ -20,8 +20,8 @@ in {
    buildInputs = with pkgs; [
      xcodeWrapper watchman procps
      flock # used in nix/scripts/node_modules.sh
-      ios-deploy # used in 'make run-ios-device'
      xcbeautify # used in 'make run-ios'
+      libimobiledevice # used in `make run-ios-device`
    ];

    # WARNING: Executes shellHook in reverse order.
@@ -26,18 +26,6 @@ in {
    react-native = callPackage ./deps/react-native { };
  };

-  # Fix for missing libarclite_macosx.a in Xcode 14.3.
-  # https://github.com/ios-control/ios-deploy/issues/580
-  ios-deploy = super.darwin.ios-deploy.overrideAttrs (old: rec {
-    version = "1.12.2";
-    src = super.fetchFromGitHub {
-      owner = "ios-control";
-      repo = "ios-deploy";
-      rev = version;
-      sha256 = "sha256-TVGC+f+1ow3b93CK3PhIL70le5SZxxb2ug5OkIg8XCA";
-    };
-  });
-
  # Clojure's linter receives frequent upgrades, and we want to take advantage
  # of the latest available rules.
  clj-kondo = super.clj-kondo.override rec {
@@ -53,6 +53,14 @@ copyNodeModules() {

 # Find files that were modified and should cause a re-copying of node modules.
 # Some files are generated/modified by build processes and should be ignored.
+#
+# react-native/ReactCommon/react/renderer/components/rncore/*
+# generated at runtime by react-native
+# related code https://github.com/facebook/react-native/blob/v0.72.5/packages/react-native/ReactCommon/React-rncore.podspec#L19
+#
+# react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m
+# generated at runtime by react-native-config
+# related code https://github.com/lugg/react-native-config/blob/v1.5.0/react-native-config.podspec#L52
 findFilesNewerThan() {
  local sentinel="${1}"
  local dir="${2}"
@@ -61,6 +69,8 @@ findFilesNewerThan() {
      -not -ipath "*/*android/build/*" -prune \
      -not -ipath "*/xcuserdata/*" -prune \
      -not -ipath "*/scripts/.packager.env" \
+      -not -path "*/node_modules/react-native/ReactCommon/react/renderer/components/rncore/*" \
+      -not -path "*/node_modules/react-native-config/ios/ReactNativeConfig/GeneratedDotEnv.m" \
      -print
 }

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 # Increment a version string using Semantic Versioning (SemVer) terminology.

@@ -1,37 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
-set -m # needed to access jobs

 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-
-# We run Metro in background while calling adb.
-cleanupMetro() {
-    pkill -f run-metro.sh
-    rm -f metro-server-logs.log
-}
-
-# Using function gives a neater jobspec name.
-runMetro() {
-   nohup "${GIT_ROOT}/scripts/run-metro.sh" 2>&1 \
-        | tee metro-server-logs.log
-}
-
-waitForMetro() {
-    set +e # Allow grep command to fail in the loop.
-    TIMEOUT=5
-    echo "Waiting for Metro server..." >&2
-    while ! grep -q "Welcome to Metro" metro-server-logs.log; do
-      echo -n "." >&2
-      sleep 1
-      if ((TIMEOUT == 0)); then
-        echo -e "\nMetro server timed out, exiting" >&2
-        set -e # Restore errexit for rest of script.
-        return 1
-      fi
-      ((TIMEOUT--))
-    done
-    set -e # Restore errexit for rest of script.
-}
+ADB_INSTALL_LOG_FILE="${GIT_ROOT}/logs/adb_install.log"
+ADB_SHELL_MONKEY_LOG_FILE="${GIT_ROOT}/logs/adb_shell_monkey.log"

 # Generate android debug build.
 export ANDROID_ABI_INCLUDE=$("${GIT_ROOT}/scripts/adb_devices_abis.sh")
@@ -40,14 +12,19 @@ export BUILD_TYPE=debug
 "${GIT_ROOT}/scripts/build-android.sh"

 # Install the APK on running emulator or android device.
-adb install ./result/app-debug.apk
+installAndLaunchApp() {
+  adb install -r ./result/app-debug.apk > "${ADB_INSTALL_LOG_FILE}" 2>&1
+  "${GIT_ROOT}/scripts/wait-for-metro-port.sh" 2>&1
+  # connected android devices need this port to be exposed for metro
+  adb reverse "tcp:${RCT_METRO_PORT}" "tcp:${RCT_METRO_PORT}"
+  adb shell monkey -p im.status.ethereum.debug 1 > "${ADB_SHELL_MONKEY_LOG_FILE}" 2>&1
+}

-trap cleanupMetro EXIT ERR INT QUIT
-runMetro &
-waitForMetro
+showAdbLogs() {
+  cat "${ADB_INSTALL_LOG_FILE}" >&2;
+  cat "${ADB_SHELL_MONKEY_LOG_FILE}" >&2;
+}

-# Start the installed app.
-adb shell monkey -p im.status.ethereum.debug 1
-
-# bring metro job to foreground
-fg 'runMetro'
+trap showAdbLogs EXIT ERR INT QUIT
+installAndLaunchApp &
+exec "${GIT_ROOT}/scripts/run-metro.sh" 2>&1
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+set -euo pipefail
+set -m # needed to access jobs
+
+GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
+XCRUN_DEVICE_INSTALL_LOG_DIR="${GIT_ROOT}/logs/xcrun_device_install.log"
+XCRUN_DEVICE_PROCESS_LAUNCH_LOG_DIR="${GIT_ROOT}/logs/xcrun_device_process_launch.log"
+XCRUN_DEVICE_PROCESS_RESUME_LOG_DIR="${GIT_ROOT}/logs/xcrun_device_process_resume.log"
+
+# Install on the connected device
+installAndLaunchApp() {
+  xcrun devicectl device install app --device "${DEVICE_UUID}" "${APP_PATH}" --json-output "${XCRUN_DEVICE_INSTALL_LOG_DIR}" 2>&1
+
+  # Extract installationURL
+  INSTALLATION_URL=$(jq -r '.result.installedApplications[0].installationURL' "${XCRUN_DEVICE_INSTALL_LOG_DIR}")
+
+  # launch the app and put it in background
+  xcrun devicectl device process launch --no-activate --verbose --device "${DEVICE_UUID}" "${INSTALLATION_URL}" --json-output "${XCRUN_DEVICE_PROCESS_LAUNCH_LOG_DIR}"
+
+  # Extract background PID of status app
+  STATUS_PID=$(jq -r '.result.process.processIdentifier' "${XCRUN_DEVICE_PROCESS_LAUNCH_LOG_DIR}")
+  "${GIT_ROOT}/scripts/wait-for-metro-port.sh"  2>&1
+
+  # now that metro is ready, resume the app from background
+  xcrun devicectl device process resume --device "${DEVICE_UUID}" --pid "${STATUS_PID}" > "${XCRUN_DEVICE_PROCESS_RESUME_LOG_DIR}" 2>&1
+}
+
+showXcrunLogs() {
+  cat "${XCRUN_DEVICE_INSTALL_LOG_DIR}" >&2;
+  cat "${XCRUN_DEVICE_PROCESS_LAUNCH_LOG_DIR}" >&2;
+  cat "${XCRUN_DEVICE_PROCESS_RESUME_LOG_DIR}" >&2;
+}
+
+# find the first connected iPhone's UUID
+DEVICE_UUID=$(idevice_id -l)
+
+# Check if any device is connected
+if [ -z "${DEVICE_UUID}" ]; then
+    echo "No connected iPhone device detected."
+    exit 1
+else
+    echo "Connected iPhone UDID: ${DEVICE_UUID}"
+fi
+
+BUILD_DIR="${GIT_ROOT}/build"
+
+#iOS build of debug scheme
+xcodebuild -workspace "ios/StatusIm.xcworkspace" -configuration Debug -scheme StatusIm -destination id="${DEVICE_UUID}" -derivedDataPath "${BUILD_DIR}" -verbose | xcbeautify
+
+APP_PATH="${BUILD_DIR}/Build/Products/Debug-iphoneos/StatusIm.app"
+
+trap showXcrunLogs EXIT ERR INT QUIT
+installAndLaunchApp &
+exec "${GIT_ROOT}/scripts/run-metro.sh" 2>&1
+
@@ -3,34 +3,21 @@ set -euo pipefail
 set -m # needed to access jobs

 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
+XCRUN_INSTALL_LOG_FILE="${GIT_ROOT}/logs/xcrun_install.log"
+XCRUN_LAUNCH_LOG_FILE="${GIT_ROOT}/logs/xcrun_launch.log"
+XCRUN_SIMULATOR_JSON_FILE="${GIT_ROOT}/logs/ios_simulators_list.log"
+
+# Install on the simulator
+installAndLaunchApp() {
+  xcrun simctl install "$UDID" "$APP_PATH" > "${XCRUN_INSTALL_LOG_FILE}" 2>&1
+  "${GIT_ROOT}/scripts/wait-for-metro-port.sh"  2>&1
+  xcrun simctl launch "$UDID" im.status.ethereum.debug > "${XCRUN_LAUNCH_LOG_FILE}" 2>&1

-# We run Metro in background while calling adb.
-cleanupMetro() {
-    pkill -f run-metro.sh
-    rm -f metro-server-logs.log
 }

-# Using function gives a neater jobspec name.
-runMetro() {
-   nohup "${GIT_ROOT}/scripts/run-metro.sh" 2>&1 \
-        | tee metro-server-logs.log
-}
-
-waitForMetro() {
-    set +e # Allow grep command to fail in the loop.
-    TIMEOUT=5
-    echo "Waiting for Metro server..." >&2
-    while ! grep -q "Welcome to Metro" metro-server-logs.log; do
-      echo -n "." >&2
-      sleep 1
-      if ((TIMEOUT == 0)); then
-        echo -e "\nMetro server timed out, exiting" >&2
-        set -e # Restore errexit for rest of script.
-        return 1
-      fi
-      ((TIMEOUT--))
-    done
-    set -e # Restore errexit for rest of script.
+showXcrunLogs() {
+  cat "${XCRUN_INSTALL_LOG_FILE}" >&2;
+  cat "${XCRUN_LAUNCH_LOG_FILE}" >&2;
 }

 # Check if the first argument is provided
@@ -39,41 +26,44 @@ if [ -z "${1-}" ]; then
    exit 1
 fi

+# fetch available iOS Simulators
+xcrun simctl list devices -j > "${XCRUN_SIMULATOR_JSON_FILE}"
+
 SIMULATOR=${1}

-# get our desired UUID
-UUID=$(xcrun simctl list devices | grep -E "$SIMULATOR \(" | head -n 1 | awk -F '[()]' '{print $2}')
+# get the first available UDID for Simulators that match the name
+read -r UDID SIMULATOR_STATE IS_AVAILABLE < <(jq --raw-output --arg simulator "${SIMULATOR}" '
+  [ .devices[] | .[] | select(.name == $simulator) ] |
+  map(select(.isAvailable)) + map(select(.isAvailable | not)) |
+  first |
+  "\(.udid) \(.state) \(.isAvailable)"
+' "${XCRUN_SIMULATOR_JSON_FILE}")

-# get simulator status
-SIMULATOR_STATE=$(xcrun simctl list devices | grep -E "$SIMULATOR \(" | head -n 1 | awk '{print $NF}')
+if [ "${IS_AVAILABLE}" == false ] || [ "${UDID}" == null ]; then
+    echo "Error: Simulator ${SIMULATOR} is not available, Please find and install them."
+    echo "For help please refer"
+    echo "https://developer.apple.com/documentation/safari-developer-tools/adding-additional-simulators#Add-and-remove-Simulators " >&2
+    exit 1
+fi

 # sometimes a simulator is already running, shut it down to avoid errors
-if [ "$SIMULATOR_STATE" != "(Shutdown)" ]; then
-    xcrun simctl shutdown "$UUID"
+if [ "${SIMULATOR_STATE}" != "Shutdown" ]; then
+    xcrun simctl shutdown "${UDID}"
 fi

 # boot up iOS for simulator
-xcrun simctl boot "$UUID"
+xcrun simctl boot "${UDID}"

 # start the simulator
-open -a Simulator --args -CurrentDeviceUDID "$UUID"
+open -a Simulator --args -CurrentDeviceUDID "${UDID}"

 BUILD_DIR="${GIT_ROOT}/build"

 #iOS build of debug scheme
-xcodebuild -workspace "ios/StatusIm.xcworkspace" -configuration Debug -scheme StatusIm -destination id="$UUID" -derivedDataPath "${BUILD_DIR}" | xcbeautify
+xcodebuild -workspace "ios/StatusIm.xcworkspace" -configuration Debug -scheme StatusIm -destination id="${UDID}" -derivedDataPath "${BUILD_DIR}" -verbose | xcbeautify

 APP_PATH="${BUILD_DIR}/Build/Products/Debug-iphonesimulator/StatusIm.app"

-# Install on the simulator
-xcrun simctl install "$UUID" "$APP_PATH"
-
-trap cleanupMetro EXIT ERR INT QUIT
-runMetro &
-waitForMetro
-
-# launch the app when metro is ready
-xcrun simctl launch "$UUID" im.status.ethereum.debug
-
-# bring metro job to foreground
-fg 'runMetro'
+trap showXcrunLogs EXIT ERR INT QUIT
+installAndLaunchApp &
+exec "${GIT_ROOT}/scripts/run-metro.sh" 2>&1
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+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
+    echo "."
+    sleep 1
+    ((TIMEOUT--))
+  else
+    break
+  fi
+done
@@ -10,6 +10,7 @@
                [com.cognitect/transit-cljs "0.8.280"]
                [camel-snake-kebab "0.4.3"]
                [metosin/malli "0.13.0"]
+                [funcool/promesa "11.0.678"]

                ;; Dev dependencies
                [refactor-nrepl "3.9.1"]
@@ -1,4 +1,5 @@
-import { withTiming, runOnJS } from 'react-native-reanimated';
+import { useAnimatedReaction, withTiming, runOnJS } from 'react-native-reanimated';
+import { useState } from 'react';

 export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callback) {
  return function (event) {
@@ -12,3 +13,21 @@ export function messagesListOnScroll(distanceFromListTop, chatListScrollY, callb
    runOnJS(callback)(layoutHeight, newDistance);
  };
 }
+
+export function useMessagesScrolledToThreshold(distanceFromListTop, threshold) {
+  const [scrolledToThreshold, setScrolledToThreshold] = useState(false);
+
+  useAnimatedReaction(
+    function () {
+      return distanceFromListTop.value <= threshold;
+    },
+    function (current) {
+      if (current !== scrolledToThreshold) {
+        runOnJS(setScrolledToThreshold)(current);
+      }
+    },
+    [scrolledToThreshold],
+  );
+
+  return scrolledToThreshold;
+}
@@ -19,6 +19,13 @@ export function navigationHeaderPosition(distanceFromListTop, isAllLoaded, topBa
  });
 }

+export function navigationButtonsCompleteOpacity(isCalculationComplete) {
+  return useDerivedValue(function () {
+    'worklet';
+    return isCalculationComplete.value ? withTiming(1) : 0;
+  });
+}
+
 export function interpolateNavigationViewOpacity(props) {
  return useDerivedValue(function () {
    'worklet';
@@ -28,10 +28,10 @@

    [:f>
     (fn []
-       (rn/use-effect (fn []
-                        (rn/hw-back-add-listener dismiss-bottom-sheet-callback)
-                        (fn []
-                          (rn/hw-back-remove-listener dismiss-bottom-sheet-callback))))
+       (rn/use-mount (fn []
+                       (rn/hw-back-add-listener dismiss-bottom-sheet-callback)
+                       (fn []
+                         (rn/hw-back-remove-listener dismiss-bottom-sheet-callback))))
       [theme/provider {:theme (or page-theme (theme/get-theme))}
        [bottom-sheet/bottom-sheet opts
         (when content
@@ -16,12 +16,14 @@
   :align-self       :center})

 (def backdrop
-  {:position         :absolute
-   :left             0
-   :right            0
-   :bottom           0
-   :top              0
-   :background-color colors/neutral-100})
+  {:position :absolute
+   :left     0
+   :right    0
+   :bottom   0
+   :top      0})
+
+(def backdrop-color
+  {:background-color colors/neutral-100})

 (def container
  {:position :absolute
@@ -207,11 +207,13 @@
                           [@show-bottom-sheet? @expanded? @gesture-running?])

         [:<>
-          [rn/touchable-without-feedback {:on-press (when backdrop-dismiss? close-bottom-sheet)}
+          [rn/pressable
+           {:on-press (when backdrop-dismiss? close-bottom-sheet)
+            :style    styles/backdrop}
           [reanimated/view
            {:style (reanimated/apply-animations-to-style
                     {:opacity bg-opacity}
-                     styles/backdrop)}]]
+                     styles/backdrop-color)}]]
          (cond->> [reanimated/view
                    {:style (reanimated/apply-animations-to-style
                             {:transform [{:translateY translate-y}]}
@@ -3,7 +3,6 @@
    ["eth-phishing-detect" :as eth-phishing-detect]
    [clojure.string :as string]
    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
-    [legacy.status-im.browser.eip3085 :as eip3085]
    [legacy.status-im.browser.eip3326 :as eip3326]
    [legacy.status-im.browser.permissions :as browser.permissions]
    [legacy.status-im.browser.webview-ref :as webview-ref]
@@ -16,6 +15,7 @@
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
    [react-native.platform :as platform]
+    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.common.universal-links :as links]
    [status-im.constants :as constants]
    [status-im.contexts.chat.events :as chat.events]
@@ -443,9 +443,6 @@
        (= method "wallet_switchEthereumChain")
        (eip3326/handle-switch-ethereum-chain cofx dapp-name id message-id (first params))

-        (= method "wallet_addEthereumChain")
-        (eip3085/handle-add-ethereum-chain cofx dapp-name id message-id (first params))
-
        :else
        {:browser/call-rpc [payload
                            #(re-frame/dispatch [:browser.callback/call-rpc
@@ -658,12 +655,11 @@
                          stored-bookmarks)]
    {:db (assoc db :bookmarks/bookmarks bookmarks)}))

-(rf/defn initialize-browser
-  [_]
-  {:json-rpc/call
-   [{:method     "wakuext_getBrowsers"
-     :on-success #(re-frame/dispatch [::initialize-browsers %])}
-    {:method     "browsers_getBookmarks"
-     :on-success #(re-frame/dispatch [::initialize-bookmarks %])}
-    {:method     "permissions_getDappPermissions"
-     :on-success #(re-frame/dispatch [::initialize-dapp-permissions %])}]})
+(re-frame/reg-fx :browser/initialize-browser
+ (fn []
+   (json-rpc/call {:method     "wakuext_getBrowsers"
+                   :on-success [::initialize-browsers]})
+   (json-rpc/call {:method     "browsers_getBookmarks"
+                   :on-success [::initialize-bookmarks]})
+   (json-rpc/call {:method     "permissions_getDappPermissions"
+                   :on-success [::initialize-dapp-permissions]})))
@@ -2,10 +2,6 @@
 ;(`wallet_addEthereumChain`)
 (ns legacy.status-im.browser.eip3085
  (:require
-    [clojure.string :as string]
-    [legacy.status-im.network.core :as network]
-    [legacy.status-im.ui.screens.browser.eip3085.sheet :as sheet]
-    [legacy.status-im.utils.random :as random]
    [re-frame.core :as re-frame]
    [status-im.constants :as constants]
    [taoensso.timbre :as log]
@@ -40,37 +36,3 @@
                                        :message "User rejected the request."}}
   :dispatch               [:bottom-sheet/hide-old]})

-(rf/defn handle-add-ethereum-chain
-  {:events [:eip3085/handle-add-ethereum-chain]}
-  [{{:networks/keys [networks] :as db} :db :as cofx}
-   dapp-name id message-id
-   {:keys [chainId blockExplorerUrls chainName iconUrls nativeCurrency rpcUrls] :as params}]
-  (let [manage {:name       {:value chainName}
-                :symbol     {:value (:symbol nativeCurrency)}
-                :url        {:value (first rpcUrls)}
-                :network-id {:value chainId}
-                :chain      {:value :custom}}]
-    (if (network/valid-manage? manage)
-      (let [{:keys [name url chain network-id symbol]} manage
-            random-id                                  (string/replace (random/id) "-" "")
-            network                                    (network/new-network random-id
-                                                                            (:value name)
-                                                                            (:value symbol)
-                                                                            (:value url)
-                                                                            (:value chain)
-                                                                            (:value network-id))
-            new-networks                               (assoc networks random-id network)
-            params                                     (assoc params
-                                                              :new-networks new-networks
-                                                              :id           id
-                                                              :new-network  network)]
-        (if (network/chain-id-available? networks network)
-          {:dispatch [:bottom-sheet/show-sheet-old
-                      {:content (fn []
-                                  [sheet/permissions-panel dapp-name message-id params])}]}
-          (send-success-call-to-bridge cofx id message-id)))
-      {:browser/send-to-bridge {:type      constants/web3-send-async-callback
-                                :messageId message-id
-                                :error     {:code    -32602
-                                            :message "invalid network parameters"}}})))
-
@@ -4,7 +4,6 @@
    [legacy.status-im.chat.models.loading :as chat.loading]
    [legacy.status-im.data-store.messages :as data-store.messages]
    [legacy.status-im.utils.deprecated-types :as types]
-    [re-frame.core :as re-frame]
    [react-native.platform :as platform]
    [status-im.contexts.chat.messenger.messages.delete-message.events :as delete-message]
    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
@@ -135,9 +134,7 @@
                                    message-id (:messageId removed-message)]
                                (data-store.messages/mark-messages-seen chat-id
                                                                        [message-id]
-                                                                        #(re-frame/dispatch
-                                                                          [:chat/decrease-unviewed-count
-                                                                           chat-id %3]))))
+                                                                        nil)))
                            removed-messages)
        remove-messages-fx (fn [{:keys [db]}]
                             {:dispatch [:activity-center.notifications/fetch-unread-count]})]
@@ -4,7 +4,6 @@
    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
    legacy.status-im.communities.e2e
    [re-frame.core :as re-frame]
-    [status-im.contexts.shell.activity-center.events :as activity-center]
    [status-im.navigation.events :as navigation]
    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))
@@ -84,13 +83,12 @@
            (navigation/navigate-back)
            (handle-response response-js)))

-(rf/defn member-banned
-  {:events [::member-banned]}
-  [cofx response-js]
-  (rf/merge cofx
-            (bottom-sheet/hide-bottom-sheet-old)
-            (handle-response response-js)
-            (activity-center/notifications-fetch-unread-count)))
+(re-frame/reg-event-fx ::member-banned
+ (fn [{:keys [db]} [response-js]]
+   {:db (assoc db :bottom-sheet/show? false)
+    :fx [[:dismiss-bottom-sheet-overlay-old]
+         [:sanitize-messages-and-process-response response-js]
+         [:activity-center.notifications/fetch-unread-count]]}))

 (rf/defn member-ban
  {:events [::member-ban]}
@@ -6,7 +6,6 @@
    [re-frame.core :as re-frame]
    [status-im.contexts.chat.contacts.events :as contacts-store]
    [status-im.contexts.chat.messenger.messages.list.events :as message-list]
-    [status-im.contexts.shell.activity-center.events :as activity-center]
    [status-im.navigation.events :as navigation]
    [utils.re-frame :as rf]))

@@ -45,21 +44,23 @@
    (apply
     rf/merge
     cofx
-     {:db                                                     (->
-                                                                db
-                                                                (update :chats dissoc public-key)
-                                                                (update :chats-home-list disj public-key)
-                                                                (assoc-in [:contacts/contacts public-key
-                                                                           :added?]
-                                                                          false))
-      :dispatch                                               [:shell/close-switcher-card public-key]
-      :effects/push-notifications-clear-message-notifications [public-key]}
-     (activity-center/notifications-fetch-unread-count)
+     {:db (->
+            db
+            (update :chats dissoc public-key)
+            (update :chats-home-list disj public-key)
+            (assoc-in [:contacts/contacts public-key
+                       :added?]
+                      false))
+      :fx [[:activity-center.notifications/fetch-unread-count]
+           [:effects/push-notifications-clear-message-notifications [public-key]]
+           [:dispatch [:shell/close-switcher-card public-key]]]}
     fxs)))

 (rf/defn block-contact
  {:events [:contact.ui/block-contact-confirmed]}
-  [{:keys [db] :as cofx} public-key]
+  [{:keys [db] :as cofx} public-key
+   {:keys [handle-navigation?]
+    :or   {handle-navigation? true}}]
  (let [contact               (-> (contact.db/public-key->contact
                                   (:contacts/contacts db)
                                   public-key)
@@ -76,9 +77,10 @@
                 (re-frame/dispatch [:sanitize-messages-and-process-response block-contact])
                 (re-frame/dispatch [:hide-popover])))
              ;; reset navigation to avoid going back to non existing one to one chat
-              (if from-one-to-one-chat?
-                (navigation/pop-to-root :shell-stack)
-                (navigation/navigate-back)))))
+              (when handle-navigation?
+                (if from-one-to-one-chat?
+                  (navigation/pop-to-root :shell-stack)
+                  (navigation/navigate-back))))))

 (rf/defn contact-unblocked
  {:events [:contacts/unblocked]}
@@ -45,12 +45,12 @@
    (query-fn (comp participant-set :public-key) (vals all-contacts))))

 (defn get-all-contacts-in-group-chat
-  [members admins contacts {:keys [public-key preferred-name name] :as current-account}]
+  [members admins contacts {:keys [public-key preferred-name name display-name] :as current-account}]
  (let [current-contact (some->
                          current-account
-                          (select-keys [:name :preferred-name :public-key :images])
+                          (select-keys [:name :preferred-name :public-key :images :compressed-key])
                          (set/rename-keys {:name :alias :preferred-name :name})
-                          (assoc :primary-name (or preferred-name name)))
+                          (assoc :primary-name (or display-name preferred-name name)))
        all-contacts    (cond-> contacts
                          current-contact
                          (assoc public-key current-contact))]
@@ -1,7 +1,6 @@
 (ns legacy.status-im.currency.core
  (:require
    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
-    [legacy.status-im.wallet.prices :as prices]
    [utils.re-frame :as rf]))

 (defn get-currency
@@ -16,5 +15,4 @@
             :currency
             currency
             ;; on changing currency, we should fetch tokens prices again
-             {:on-success #(rf/dispatch [:wallet/get-wallet-token])})
-            (prices/update-prices)))
+             {:on-success #(rf/dispatch [:wallet/get-wallet-token])})))
@@ -29,37 +29,41 @@

  (testing "transforms messages from RPC response"
    (is
-     (= {:last-message  {:quoted-message     nil
-                         :outgoing-status    nil
-                         :command-parameters nil
-                         :link-previews      []
-                         :content            {:sticker     nil
-                                              :rtl?        nil
-                                              :ens-name    nil
-                                              :parsed-text nil
-                                              :response-to nil
-                                              :chat-id     nil
-                                              :image       nil
-                                              :line-count  nil
-                                              :links       nil
-                                              :text        nil}
-                         :outgoing           false}
+     (= {:last-message  {:quoted-message       nil
+                         :outgoing-status      nil
+                         :command-parameters   nil
+                         :link-previews        []
+                         :status-link-previews []
+                         :content              {:sticker     nil
+                                                :rtl?        nil
+                                                :ens-name    nil
+                                                :parsed-text nil
+                                                :response-to nil
+                                                :chat-id     nil
+                                                :image       nil
+                                                :line-count  nil
+                                                :links       nil
+                                                :text        nil}
+                         :bridge-message       nil
+                         :outgoing             false}
         :message       nil
-         :reply-message {:quoted-message     nil
-                         :outgoing-status    nil
-                         :command-parameters nil
-                         :link-previews      []
-                         :content            {:sticker     nil
-                                              :rtl?        nil
-                                              :ens-name    nil
-                                              :parsed-text nil
-                                              :response-to nil
-                                              :chat-id     nil
-                                              :image       nil
-                                              :line-count  nil
-                                              :links       nil
-                                              :text        nil}
-                         :outgoing           false}}
+         :reply-message {:quoted-message       nil
+                         :outgoing-status      nil
+                         :command-parameters   nil
+                         :link-previews        []
+                         :status-link-previews []
+                         :content              {:sticker     nil
+                                                :rtl?        nil
+                                                :ens-name    nil
+                                                :parsed-text nil
+                                                :response-to nil
+                                                :chat-id     nil
+                                                :image       nil
+                                                :line-count  nil
+                                                :links       nil
+                                                :text        nil}
+                         :bridge-message       nil
+                         :outgoing             false}}
        (-> raw-notification
            store/<-rpc
            (select-keys [:last-message :message :reply-message])))))
@@ -1,11 +1,13 @@
 (ns legacy.status-im.data-store.chats
  (:require
    [clojure.set :as set]
+    [clojure.string :as string]
    [legacy.status-im.data-store.messages :as messages]
    [legacy.status-im.utils.deprecated-types :as types]
+    [re-frame.core :as re-frame]
+    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.constants :as constants]
-    [taoensso.timbre :as log]
-    [utils.re-frame :as rf]))
+    [taoensso.timbre :as log]))

 (defn rpc->type
  [{:keys [chat-type name] :as chat}]
@@ -58,69 +60,80 @@
           :admins         #{}
           :members-joined #{})))

+(defn <-color
+  [value]
+  (if (and (some? value)
+           (string/starts-with? value "#"))
+    value
+    (keyword value)))
+
 (defn <-rpc
  [chat]
  (-> chat
-      (set/rename-keys {:id                     :chat-id
-                        :communityId            :community-id
-                        :syncedFrom             :synced-from
-                        :syncedTo               :synced-to
-                        :membershipUpdateEvents :membership-update-events
-                        :deletedAtClockValue    :deleted-at-clock-value
-                        :chatType               :chat-type
-                        :unviewedMessagesCount  :unviewed-messages-count
-                        :unviewedMentionsCount  :unviewed-mentions-count
-                        :lastMessage            :last-message
-                        :lastClockValue         :last-clock-value
-                        :invitationAdmin        :invitation-admin
-                        :profile                :profile-public-key
-                        :muteTill               :muted-till})
+      (set/rename-keys {:id                      :chat-id
+                        :communityId             :community-id
+                        :syncedFrom              :synced-from
+                        :syncedTo                :synced-to
+                        :membershipUpdateEvents  :membership-update-events
+                        :deletedAtClockValue     :deleted-at-clock-value
+                        :chatType                :chat-type
+                        :unviewedMessagesCount   :unviewed-messages-count
+                        :unviewedMentionsCount   :unviewed-mentions-count
+                        :lastMessage             :last-message
+                        :lastClockValue          :last-clock-value
+                        :invitationAdmin         :invitation-admin
+                        :profile                 :profile-public-key
+                        :muteTill                :muted-till
+                        :hideIfPermissionsNotMet :hide-if-permissions-not-met?})
      rpc->type
      unmarshal-members
      (update :last-message #(when % (messages/<-rpc %)))
+      (update :color <-color)
      (dissoc :members)))

 (defn <-rpc-js
  [^js chat]
-  (-> {:name                    (.-name chat)
-       :description             (.-description chat)
-       :color                   (.-color chat)
-       :emoji                   (.-emoji chat)
-       :timestamp               (.-timestamp chat)
-       :alias                   (.-alias chat)
-       :muted                   (.-muted chat)
-       :joined                  (.-joined chat)
-       :muted-till              (.-muteTill chat)
-       :chat-id                 (.-id chat)
-       :community-id            (.-communityId chat)
-       :synced-from             (.-syncedFrom chat)
-       :synced-to               (.-syncedTo chat)
-       :deleted-at-clock-value  (.-deletedAtClockValue chat)
-       :chat-type               (.-chatType chat)
-       :unviewed-messages-count (.-unviewedMessagesCount chat)
-       :unviewed-mentions-count (.-unviewedMentionsCount chat)
-       :last-message            {:content            {:text        (.-text chat)
-                                                      :parsed-text (types/js->clj (.-parsedText chat))
-                                                      :response-to (.-responseTo chat)}
-                                 :content-type       (.-contentType chat)
-                                 :community-id       (.-contentCommunityId chat)
-                                 :outgoing           (boolean (.-outgoingStatus chat))
-                                 :album-images-count (.-albumImagesCount chat)
-                                 :from               (.-from chat)
-                                 :deleted?           (.-deleted chat)
-                                 :deleted-for-me?    (.-deletedForMe chat)}
-       :last-clock-value        (.-lastClockValue chat)
-       :profile-public-key      (.-profile chat)
-       :highlight               (.-highlight chat)
-       :active                  (.-active chat)
-       :members                 (types/js->clj (.-members chat))}
+  (-> {:name                        (.-name chat)
+       :description                 (.-description chat)
+       :color                       (<-color (.-color chat))
+       :emoji                       (.-emoji chat)
+       :timestamp                   (.-timestamp chat)
+       :alias                       (.-alias chat)
+       :muted                       (.-muted chat)
+       :joined                      (.-joined chat)
+       :muted-till                  (.-muteTill chat)
+       :chat-id                     (.-id chat)
+       :community-id                (.-communityId chat)
+       :synced-from                 (.-syncedFrom chat)
+       :synced-to                   (.-syncedTo chat)
+       :deleted-at-clock-value      (.-deletedAtClockValue chat)
+       :chat-type                   (.-chatType chat)
+       :unviewed-messages-count     (.-unviewedMessagesCount chat)
+       :unviewed-mentions-count     (.-unviewedMentionsCount chat)
+       :last-message                {:content            {:text        (.-text chat)
+                                                          :parsed-text (types/js->clj (.-parsedText
+                                                                                       chat))
+                                                          :response-to (.-responseTo chat)}
+                                     :content-type       (.-contentType chat)
+                                     :community-id       (.-contentCommunityId chat)
+                                     :outgoing           (boolean (.-outgoingStatus chat))
+                                     :album-images-count (.-albumImagesCount chat)
+                                     :from               (.-from chat)
+                                     :deleted?           (.-deleted chat)
+                                     :deleted-for-me?    (.-deletedForMe chat)}
+       :last-clock-value            (.-lastClockValue chat)
+       :profile-public-key          (.-profile chat)
+       :highlight                   (.-highlight chat)
+       :active                      (.-active chat)
+       :members                     (types/js->clj (.-members chat))
+       :hide-if-permissions-not-met (.-hideIfPermissionsNotMet chat)}
      rpc->type
      unmarshal-members))

-(rf/defn fetch-chats-preview
-  [_ {:keys [on-success]}]
-  {:json-rpc/call [{:method      "wakuext_chatsPreview"
-                    :params      []
-                    :js-response true
-                    :on-success  #(on-success ^js %)
-                    :on-error    #(log/error "failed to fetch chats" 0 -1 %)}]})
+(re-frame/reg-fx :fetch-chats-preview
+ (fn [{:keys [on-success]}]
+   (json-rpc/call {:method      "wakuext_chatsPreview"
+                   :params      []
+                   :js-response true
+                   :on-success  #(on-success ^js %)
+                   :on-error    #(log/error "failed to fetch chats" 0 -1 %)})))
@@ -5,7 +5,7 @@

 (deftest normalize-chat-test
  (let [chat          {:id                     "chat-id"
-                       :color                  "color"
+                       :color                  "yellow"
                       :name                   "name"
                       :chatType               3
                       :members                [{:id     "a"
@@ -26,7 +26,7 @@
                       :timestamp              2}
        expected-chat {:public?                  false
                       :group-chat               true
-                       :color                    "color"
+                       :color                    :yellow
                       :chat-name                "name"
                       :contacts                 #{"a" "b" "c" "d"}
                       :chat-type                3
@@ -4,13 +4,6 @@
    [clojure.walk :as walk]
    [status-im.constants :as constants]))

-(defn rpc->channel-permissions
-  [rpc-channels-permissions]
-  (update-vals rpc-channels-permissions
-               (fn [{:keys [viewAndPostPermissions viewOnlyPermissions]}]
-                 {:view-only     (set/rename-keys viewOnlyPermissions {:satisfied :satisfied?})
-                  :view-and-post (set/rename-keys viewAndPostPermissions {:satisfied :satisfied?})})))
-
 (defn <-revealed-accounts-rpc
  [accounts]
  (mapv
@@ -34,8 +27,11 @@
               (assoc acc
                      (name k)
                      (-> v
-                          (assoc :can-post? (:canPost v))
-                          (dissoc :canPost)
+                          (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))
@@ -68,6 +64,7 @@
        :canJoin                     :can-join?
        :requestedToJoinAt           :requested-to-join-at
        :isMember                    :is-member?
+        :outroMessage                :outro-message
        :adminSettings               :admin-settings
        :tokenPermissions            :token-permissions
        :communityTokensMetadata     :tokens-metadata
@@ -1,23 +0,0 @@
-(ns legacy.status-im.data-store.communities-test
-  (:require
-    [cljs.test :refer [deftest is]]
-    [legacy.status-im.data-store.communities :as sut]))
-
-(def permissions
-  {"community-id-chat-1"
-   {:viewOnlyPermissions    {:satisfied   false
-                             :permissions {:token-permission-id-01 {:criteria [false]}}}
-    :viewAndPostPermissions {:satisfied true :permissions {}}}
-   "community-id-chat-2"
-   {:viewOnlyPermissions    {:satisfied true :permissions {}}
-    :viewAndPostPermissions {:satisfied true :permissions {}}}})
-
-(deftest rpc->channel-permissions-test
-  (is (= {"community-id-chat-1"
-          {:view-only     {:satisfied?  false
-                           :permissions {:token-permission-id-01 {:criteria [false]}}}
-           :view-and-post {:satisfied? true :permissions {}}}
-          "community-id-chat-2"
-          {:view-only     {:satisfied? true :permissions {}}
-           :view-and-post {:satisfied? true :permissions {}}}}
-         (sut/rpc->channel-permissions permissions))))
@@ -16,13 +16,41 @@
                      :community-id      :communityId
                      :clock-value       :clock})))

+(defn- <-status-link-previews-rpc
+  [preview]
+  (-> preview
+      (update :community
+              set/rename-keys
+              {:communityId        :community-id
+               :displayName        :display-name
+               :membersCount       :members-count
+               :activeMembersCount :active-members-count})
+      (update-in [:community :banner] set/rename-keys {:dataUri :data-uri})
+      (update-in [:community :icon] set/rename-keys {:dataUri :data-uri})))
+
+(defn ->status-link-previews-rpc
+  [preview]
+  (-> preview
+      (update :community
+              set/rename-keys
+              {:community-id         :communityId
+               :display-name         :displayName
+               :members-count        :membersCount
+               :active-members-count :activeMembersCount})
+      (update-in [:community :banner] set/rename-keys {:data-uri :dataUri})
+      (update-in [:community :icon] set/rename-keys {:data-uri :dataUri})))
+
 (defn- <-link-preview-rpc
  [preview]
-  (update preview :thumbnail set/rename-keys {:dataUri :data-uri}))
+  (-> preview
+      (update :thumbnail set/rename-keys {:dataUri :data-uri})
+      (update :favicon set/rename-keys {:dataUri :data-uri})))

 (defn ->link-preview-rpc
  [preview]
-  (update preview :thumbnail set/rename-keys {:data-uri :dataUri}))
+  (-> preview
+      (update :thumbnail set/rename-keys {:data-uri :dataUri})
+      (update :favicon set/rename-keys {:data-uri :dataUri})))

 (defn <-rpc
  [message]
@@ -53,8 +81,16 @@
        :new                      :new?
        :albumImagesCount         :album-images-count
        :displayName              :display-name
-        :linkPreviews             :link-previews})
+        :linkPreviews             :link-previews
+        :statusLinkPreviews       :status-link-previews
+        :bridgeMessage            :bridge-message})
+      (update :bridge-message
+              set/rename-keys
+              {:bridgeName :bridge-name
+               :userName   :user-name
+               :userAvatar :user-avatar})
      (update :link-previews #(map <-link-preview-rpc %))
+      (update :status-link-previews #(map <-status-link-previews-rpc %))
      (update :quoted-message
              set/rename-keys
              {:parsedText       :parsed-text
@@ -21,6 +21,7 @@
                                                 :image       nil
                                                 :response-to "a"
                                                 :links       nil}
+                    :bridge-message             nil
                    :whisper-timestamp          1
                    :contact-verification-state 1
                    :contact-request-state      2
@@ -37,7 +38,19 @@
                    :compressed-key             "c"
                    :timestamp                  3
                    :link-previews              [{:thumbnail {:url      "http://localhost"
-                                                              :data-uri "data:image/png"}}]}
+                                                              :data-uri "data:image/png"}
+                                                  :favicon   nil}]
+                    :status-link-previews       [{:url       "http://localhost"
+                                                  :community {:community-id "0x01"
+                                                              :display-name "Test Comm"
+                                                              :members-count 12
+                                                              :active-members-count 12
+                                                              :banner
+                                                              {:data-uri
+                                                               "data:image/png"}
+                                                              :icon
+                                                              {:data-uri
+                                                               "data:image/png"}}}]}
          message  {:id                       message-id
                    :whisperTimestamp         1
                    :parsedText               "parsed-text"
@@ -61,5 +74,17 @@
                    :timestamp                3
                    :outgoingStatus           "sending"
                    :linkPreviews             [{:thumbnail {:url     "http://localhost"
-                                                            :dataUri "data:image/png"}}]}]
+                                                            :dataUri "data:image/png"}
+                                                :favicon   nil}]
+                    :statusLinkPreviews       [{:url       "http://localhost"
+                                                :community {:communityId "0x01"
+                                                            :displayName "Test Comm"
+                                                            :membersCount 12
+                                                            :activeMembersCount 12
+                                                            :banner
+                                                            {:dataUri
+                                                             "data:image/png"}
+                                                            :icon
+                                                            {:dataUri
+                                                             "data:image/png"}}}]}]
      (is (= expected (m/<-rpc message))))))
@@ -2,6 +2,8 @@
  (:require
    [clojure.set :as set]
    [clojure.walk :as walk]
+    [re-frame.core :as re-frame]
+    [status-im.common.json-rpc.events :as json-rpc]
    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))

@@ -32,11 +34,11 @@
                    :on-success #()
                    :on-error   #()}]})

-(rf/defn fetch-switcher-cards-rpc
-  [_]
-  {:json-rpc/call [{:method     "wakuext_switcherCards"
-                    :params     []
-                    :on-success #(rf/dispatch
-                                  [:shell/switcher-cards-loaded
-                                   (:switcherCards ^js %)])
-                    :on-error   #(log/error "Failed to fetch switcher cards" %)}]})
+(re-frame/reg-fx :switcher-cards/fetch
+ (fn []
+   (json-rpc/call {:method     "wakuext_switcherCards"
+                   :params     []
+                   :on-success #(rf/dispatch
+                                 [:shell/switcher-cards-loaded
+                                  (:switcherCards ^js %)])
+                   :on-error   #(log/error "Failed to fetch switcher cards" %)})))
@@ -2,8 +2,8 @@
  (:require
    [clojure.set :as set]
    [re-frame.core :as re-frame]
-    [taoensso.timbre :as log]
-    [utils.re-frame :as rf]))
+    [status-im.common.json-rpc.events :as json-rpc]
+    [taoensso.timbre :as log]))

 (defn <-rpc
  [visibility-status-update]
@@ -18,13 +18,13 @@
       {:current-user-status :current-user-visibility-status})
      (update :current-user-visibility-status <-rpc)))

-(rf/defn fetch-visibility-status-updates-rpc
-  [_]
-  {:json-rpc/call [{:method     "wakuext_statusUpdates"
-                    :params     []
-                    :on-success #(re-frame/dispatch
-                                  [:visibility-status-updates/visibility-status-updates-loaded
-                                   (:statusUpdates ^js %)])
-                    :on-error   #(log/error
-                                  "failed to fetch visibility-status-updates"
-                                  %)}]})
+(re-frame/reg-fx :visibility-status-updates/fetch
+ (fn []
+   (json-rpc/call {:method     "wakuext_statusUpdates"
+                   :params     []
+                   :on-success #(re-frame/dispatch
+                                 [:visibility-status-updates/visibility-status-updates-loaded
+                                  (:statusUpdates ^js %)])
+                   :on-error   #(log/error
+                                 "failed to fetch visibility-status-updates"
+                                 %)})))
@@ -7,7 +7,6 @@
    [legacy.status-im.ethereum.ens :as ens]
    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
    [legacy.status-im.utils.random :as random]
-    [legacy.status-im.wallet.utils :as wallet.utils]
    [re-frame.core :as re-frame]
    [status-im.constants :as constants]
    [status-im.navigation.events :as navigation]
@@ -126,7 +125,7 @@
  {:events [::set-pub-key]}
  [{:keys [db]}]
  (let [{:keys [username address custom-domain?]} (:ens/registration db)
-        address                                   (or address (wallet.utils/default-address db))
+        address                                   address
        {:keys [public-key]}                      (:profile/profile db)
        chain-id                                  (chain/chain-id db)
        username                                  (fullname custom-domain? username)]
@@ -4,7 +4,6 @@
    [legacy.status-im.ethereum.decode :as decode]
    [legacy.status-im.ethereum.encode :as encode]
    [legacy.status-im.utils.mobile-sync :as utils.mobile-sync]
-    [legacy.status-im.wallet.core :as wallet]
    [re-frame.core :as re-frame]
    [status-im.common.json-rpc.events :as json-rpc]
    [taoensso.timbre :as log]
@@ -240,7 +239,7 @@

 (rf/defn tx-history-end-reached
  [{:keys [db] :as cofx} address]
-  (let [syncing-allowed? (utils.mobile-sync/syncing-allowed? cofx)]
+  (let [syncing-allowed? (utils.mobile-sync/syncing-allowed? db)]
    {:db (assoc-in db
          [:wallet-legacy :fetching address :all-fetched?]
          (if syncing-allowed?
@@ -256,24 +255,13 @@
  (let [checksum        (eip55/address->checksum address)
        max-known-block (get-max-block-with-transfers db address)
        effects         (cond-> [(when (seq transfers)
-                                   (set-lowest-fetched-block checksum transfers))
-                                 (wallet/set-max-block-with-transfers checksum transfers)]
+                                   (set-lowest-fetched-block checksum transfers))]

                          (seq transfers)
                          (concat
                           []
                           (mapv add-transfer transfers))

-                          (and max-known-block
-                               (some #(> (:block %) max-known-block) transfers))
-                          (conj (wallet/update-balances
-                                 [address]
-                                 (zero? max-known-block)))
-
-                          (and (zero? max-known-block)
-                               (empty? transfers))
-                          (conj (wallet/set-zero-balances {:address address}))
-
                          (< (count transfers) limit)
                          (conj (tx-history-end-reached checksum)))]
    (apply rf/merge cofx (tx-fetching-ended [checksum]) effects)))
@@ -282,8 +270,7 @@
  {:events [::new-transfers]}
  [cofx transfers params]
  (rf/merge cofx
-            (handle-new-transfer transfers params)
-            (wallet/stop-fetching-on-empty-tx-history transfers)))
+            (handle-new-transfer transfers params)))

 (rf/defn tx-fetching-failed
  {:events [::tx-fetching-failed]}
@@ -340,7 +327,7 @@
      {:chain-tokens      (:wallet-legacy/all-tokens db)
       :addresses         [address]
       :before-block      min-known-block
-       :fetch-more?       (utils.mobile-sync/syncing-allowed? cofx)
+       :fetch-more?       (utils.mobile-sync/syncing-allowed? db)
       ;; Transfers are requested before and including `min-known-block` because there is no
       ;; guarantee that all transfers from that block are shown already. To make sure that we fetch
       ;; the whole `default-transfers-limit` of transfers the number of transfers already received
@@ -8,11 +8,16 @@
    legacy.status-im.chat.models.loading
    legacy.status-im.contact.block
    legacy.status-im.currency.core
+    legacy.status-im.data-store.chats
+    legacy.status-im.data-store.switcher-cards
+    legacy.status-im.data-store.visibility-status-updates
    legacy.status-im.fleet.core
+    legacy.status-im.group-chats.core
    [legacy.status-im.keycard.core :as keycard]
    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]
@@ -32,16 +37,11 @@
    legacy.status-im.visibility-status-popover.core
    legacy.status-im.visibility-status-updates.core
    legacy.status-im.waku.core
-    legacy.status-im.wallet.accounts.core
-    legacy.status-im.wallet.choose-recipient.core
-    [legacy.status-im.wallet.core :as wallet]
-    legacy.status-im.wallet.custom-tokens.core
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
    [react-native.core :as rn]
    [react-native.permissions :as permissions]
    [react-native.platform :as platform]
-    [status-im.common.biometric.events :as biometric]
    status-im.common.serialization
    status-im.common.standard-authentication.events
    [status-im.common.theme.core :as theme]
@@ -124,7 +124,7 @@
      :content             (i18n/label :t/biometric-auth-confirm-message)
      :confirm-button-text (i18n/label :t/biometric-auth-confirm-try-again)
      :cancel-button-text  (i18n/label :t/biometric-auth-confirm-logout)
-      :on-accept           #(biometric/authenticate nil {:on-fail on-biometric-auth-fail})
+      :on-accept           #(rf/dispatch [:biometric/authenticate {:on-fail on-biometric-auth-fail}])
      :on-cancel           #(re-frame/dispatch [:multiaccounts.logout.ui/logout-confirmed])})))

 (rf/defn on-return-from-background
@@ -141,13 +141,12 @@
    (rf/merge cofx
              {:db (dissoc db :app-in-background-since)}
              (mailserver/process-next-messages-request)
-              (wallet/restart-wallet-service-after-background app-in-background-since)
              (when-not new-account?
                (universal-links/process-stored-event))
              #(when-let [chat-id (:current-chat-id db)]
                 {:dispatch [:chat/mark-all-as-read chat-id]})
              #(when requires-bio-auth
-                 (biometric/authenticate % {:on-fail on-biometric-auth-fail})))))
+                 {:dispatch [:biometric/authenticate {:on-fail on-biometric-auth-fail}]}))))

 (rf/defn on-going-in-background
  [{:keys [db now]}]
@@ -198,10 +197,8 @@
               :reset-card                    (keycard/reset-card-screen-did-load %)
               :enter-pin-settings            (keycard/enter-pin-screen-did-load %)
               :keycard-login-pin             (keycard/login-pin-screen-did-load %)
-               :add-new-account-pin           (keycard/enter-pin-screen-did-load %)
               :keycard-authentication-method (keycard/authentication-method-screen-did-load %)
               :multiaccounts                 (keycard/multiaccounts-screen-did-load %)
-               :wallet-legacy                 (wallet/wallet-will-focus %)
               nil)))

 ;;TODO :replace by named events
@@ -6,9 +6,9 @@
    [legacy.status-im.data-store.invitations :as data-store.invitations]
    [oops.core :as oops]
    [re-frame.core :as re-frame]
+    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.constants :as constants]
    [status-im.contexts.chat.events :as chat.events]
-    [status-im.contexts.shell.activity-center.events :as activity-center]
    [status-im.navigation.events :as navigation]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))
@@ -19,15 +19,13 @@
  (when (get-in cofx [:db :chats chat-id])
    (chat.events/pop-to-root-and-navigate-to-chat cofx chat-id nil)))

-(rf/defn handle-chat-removed
-  {:events [:chat-removed]}
-  [cofx response chat-id]
-  (rf/merge cofx
-            {:db         (dissoc (:db cofx) :current-chat-id)
-             :dispatch-n [[:shell/close-switcher-card chat-id]
-                          [:sanitize-messages-and-process-response response]
-                          [:pop-to-root :shell-stack]]}
-            (activity-center/notifications-fetch-unread-count)))
+(re-frame/reg-event-fx :chat-removed
+ (fn [{:keys [db]} [response chat-id]]
+   {:db (dissoc db :current-chat-id)
+    :fx [[:dispatch [:shell/close-switcher-card chat-id]]
+         [:dispatch [:sanitize-messages-and-process-response response]]
+         [:dispatch [:pop-to-root :shell-stack]]
+         [:activity-center.notifications/fetch-unread-count]]}))

 (rf/defn handle-chat-update
  {:events [:chat-updated]}
@@ -66,16 +64,6 @@
                    :js-response true
                    :on-success  #(re-frame/dispatch [:chat-updated %])}]})

-(rf/defn create
-  {:events       [:group-chats.ui/create-pressed]
-   :interceptors [(re-frame/inject-cofx :random-guid-generator)]}
-  [{:keys [db] :as cofx} group-name]
-  (let [selected-contacts (:group/selected-contacts db)]
-    {:json-rpc/call [{:method      "wakuext_createGroupChatWithMembers"
-                      :params      [nil group-name (into [] selected-contacts)]
-                      :js-response true
-                      :on-success  #(re-frame/dispatch [:chat-updated %])}]}))
-
 (rf/defn create-from-link
  {:events [:group-chats/create-from-link]}
  [cofx {:keys [chat-id invitation-admin chat-name]}]
@@ -264,8 +252,7 @@
                      {}
                      invitations))})

-(rf/defn get-group-chat-invitations
-  [_]
-  {:json-rpc/call
-   [{:method     "wakuext_getGroupChatInvitations"
-     :on-success #(re-frame/dispatch [::initialize-invitations %])}]})
+(re-frame/reg-fx :group-chats/get-group-chat-invitations
+ (fn []
+   (json-rpc/call {:method     "wakuext_getGroupChatInvitations"
+                   :on-success [::initialize-invitations]})))
@@ -401,15 +401,12 @@
   (merge
    args
    {:on-success
-     (fn [response]
+     (fn [_response]
       (log/debug "[keycard response succ] export-key")
-       (re-frame/dispatch [:keycard.callback/on-export-key-success
-                           response]))
+       (js/alert "feature no longer supported"))
     :on-failure
-     (fn [response]
-       (log/debug "[keycard response fail] export-key")
-       (re-frame/dispatch [:keycard.callback/on-export-key-error
-                           (error-object->map response)]))})))
+     (fn [_response]
+       (log/debug "[keycard response fail] export-key"))})))

 (defn unpair-and-delete
  [args]
@@ -12,7 +12,6 @@
    [legacy.status-im.keycard.recovery :as recovery]
    [legacy.status-im.keycard.sign :as sign]
    legacy.status-im.keycard.unpair
-    [legacy.status-im.keycard.wallet :as wallet]
    [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
    [re-frame.db]
    [status-im.navigation.events :as navigation]
@@ -401,10 +400,6 @@
           (= pin-code-length numbers-entered))
      (common/verify-pin {:pin-step :current})

-      (and (= enter-step :export-key)
-           (= pin-code-length numbers-entered))
-      (wallet/verify-pin-with-delay)
-
      (and (= enter-step :sign)
           (= pin-code-length numbers-entered))
      (sign/prepare-to-sign)
@@ -1,51 +1,13 @@
 (ns legacy.status-im.keycard.export-key
  (:require
    [legacy.status-im.keycard.common :as common]
-    [legacy.status-im.keycard.wallet :as wallet]
-    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))

-(rf/defn on-export-key-error
-  {:events [:keycard.callback/on-export-key-error]}
-  [{:keys [db] :as cofx} error]
-  (log/debug "[keycard] export key error" error)
-  (let [tag-was-lost? (common/tag-lost? (:error error))
-        pin-retries   (common/pin-retries (:error error))]
-    (cond
-      tag-was-lost?
-      (rf/merge cofx
-                {:db (assoc-in db [:keycard :pin :status] nil)}
-                (common/set-on-card-connected :wallet-legacy.accounts/generate-new-keycard-account))
-
-      (not (nil? pin-retries))
-      (rf/merge cofx
-                {:db (-> db
-                         (assoc-in [:keycard :application-info :pin-retry-counter] pin-retries)
-                         (update-in [:keycard :pin]
-                                    assoc
-                                    :status       :error
-                                    :enter-step   :export-key
-                                    :puk          []
-                                    :current      []
-                                    :original     []
-                                    :confirmation []
-                                    :sign         []
-                                    :export-key   []
-                                    :error-label  :t/pin-mismatch))}
-                (common/hide-connection-sheet)
-                (when (zero? pin-retries) (common/frozen-keycard-popup)))
-      :else
-      (rf/merge cofx
-                (common/show-wrong-keycard-alert)
-                (common/clear-pin)
-                (common/hide-connection-sheet)))))
-
 (rf/defn on-export-key-success
  {:events [:keycard.callback/on-export-key-success]}
  [{:keys [db] :as cofx} pubkey]
  (let [callback-fn (get-in db [:keycard :on-export-success])]
    (rf/merge cofx
              {:dispatch (callback-fn pubkey)}
-              (wallet/hide-pin-sheet)
              (common/clear-pin)
              (common/hide-connection-sheet))))
@@ -3,7 +3,6 @@
    [clojure.string :as string]
    [legacy.status-im.keycard.common :as common]
    [legacy.status-im.utils.deprecated-types :as types]
-    [legacy.status-im.wallet.utils :as wallet.utils]
    [re-frame.core :as re-frame]
    [taoensso.timbre :as log]
    [utils.address :as address]
@@ -24,8 +23,7 @@
        typed?              (get-in db [:keycard :typed?])
        pin                 (common/vector->string (get-in db [:keycard :pin :sign]))
        from                (or (get-in db [:signing/tx :from :address])
-                                (get-in db [:signing/tx :message :from])
-                                (wallet.utils/default-address db))
+                                (get-in db [:signing/tx :message :from]))
        path                (reduce
                             (fn [_ {:keys [address path]}]
                               (when (address/address= from address)
@@ -1,76 +0,0 @@
-(ns legacy.status-im.keycard.wallet
-  (:require
-    [legacy.status-im.bottom-sheet.events :as bottom-sheet]
-    [legacy.status-im.keycard.common :as common]
-    [legacy.status-im.ui.screens.wallet.add-new.views :as add-new.views]
-    [legacy.status-im.utils.hex :as utils.hex]
-    [native-module.core :as native-module]
-    [status-im.constants :as constants]
-    [utils.ethereum.eip.eip55 :as eip55]
-    [utils.re-frame :as rf]))
-
-(rf/defn show-pin-sheet
-  {:events [:keycard/new-account-pin-sheet]}
-  [{:keys [db] :as cofx}]
-  (rf/merge
-   cofx
-   {:db               (-> db
-                          (assoc-in [:keycard :pin :enter-step] :export-key)
-                          (update-in [:keycard :pin] dissoc :export-key))
-    :dismiss-keyboard nil}
-   (bottom-sheet/show-bottom-sheet-old {:view {:content add-new.views/pin}})))
-
-(rf/defn verify-pin-with-delay
-  [cofx]
-  {:utils/dispatch-later
-   ;; We need to give previous sheet some time to be fully hidden
-   [{:ms       200
-     :dispatch [:wallet-legacy.accounts/verify-pin]}]})
-
-(rf/defn hide-pin-sheet
-  {:events [:keycard/new-account-pin-sheet-hide]}
-  [cofx]
-  (bottom-sheet/hide-bottom-sheet-old cofx))
-
-(defn public-key->address
-  [public-key]
-  (let [length         (count public-key)
-        normalized-key (case length
-                         132 (str "0x" (subs public-key 4))
-                         130 public-key
-                         128 (str "0x" public-key)
-                         nil)]
-    (when normalized-key
-      (subs (native-module/sha3 normalized-key) 26))))
-
-(rf/defn generate-new-keycard-account
-  {:events [:wallet-legacy.accounts/generate-new-keycard-account]}
-  [{:keys [db]}]
-  (let [path-num (inc (get-in db [:profile/profile :latest-derived-path]))
-        path     (str constants/path-wallet-root "/" path-num)
-        pin      (common/vector->string (get-in db [:keycard :pin :export-key]))]
-    {:db
-     (assoc-in
-      db
-      [:keycard :on-export-success]
-      #(vector :wallet-legacy.accounts/account-stored
-               (let [public-key (utils.hex/normalize-hex %)]
-                 {;; Strip leading 04 prefix denoting uncompressed key format
-                  :address    (eip55/address->checksum
-                               (str "0x"
-                                    (public-key->address
-                                     (subs public-key 2))))
-                  :public-key (str "0x" public-key)
-                  :path       path})))
-
-     :keycard/export-key {:pin pin :path path}}))
-
-(rf/defn verify-pin
-  {:events [:wallet-legacy.accounts/verify-pin]}
-  [cofx]
-  (common/verify-pin
-   cofx
-   {:pin-step          :export-key
-    :on-card-connected :wallet-legacy.accounts/verify-pin
-    :on-success        :wallet-legacy.accounts/generate-new-keycard-account
-    :on-failure        :keycard/new-account-pin-sheet}))
@@ -5,6 +5,7 @@
    [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]
@@ -61,7 +62,7 @@
           (dissoc :mailserver/current-request :mailserver/fetching-gaps-in-progress))})

 (defn fetch-use-mailservers?
-  [{:keys [db]}]
+  [db]
  (get-in db [:profile/profile :use-mailservers?]))

 (defonce showing-connection-error-popup? (atom false))
@@ -117,24 +118,32 @@
  [{: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 now] :as cofx}]
-  (when (and
-         (:messenger/started? db)
-         (mobile-network-utils/syncing-allowed? cofx)
-         (fetch-use-mailservers? cofx)
-         (not (:mailserver/current-request db)))
-    {:db            (assoc db :mailserver/current-request true)
-     :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]))}]}))
+  [{: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]
@@ -5,8 +5,7 @@
    [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]
-    [legacy.status-im.wallet.core :as wallet]
-    [status-im.contexts.chat.home.add-new-contact.events :as add-new-contact]
+    [re-frame.core :as re-frame]
    [status-im.navigation.events :as navigation]
    [taoensso.timbre :as log]
    [utils.re-frame :as rf]))
@@ -19,28 +18,24 @@
                (or (nil? remember-choice?)
                    remember-choice?))}))

-(rf/defn on-network-status-change
-  [{:keys [db] :as cofx}]
-  (let [initialized?                       (get db :network-status/initialized?)
-        logged-in?                         (multiaccounts.model/logged-in? db)
-        {:keys [remember-syncing-choice?]} (:profile/profile db)]
-    (apply
-     rf/merge
-     cofx
-     {:db (assoc db :network-status/initialized? true)}
-     (cond
-       ;; NOTE(rasom): When we log into account on-network-status-change is
-       ;; dispatched, but that doesn't mean there was a status change, thus
-       ;; no reason to restart wallet.
-       (and logged-in? initialized?)
-       [(mailserver/process-next-messages-request)
-        (bottom-sheet/hide-bottom-sheet-old)
-        (wallet/restart-wallet-service nil)
-        #(add-new-contact/set-new-identity-reconnected %)]
-
-       logged-in?
-       [(mailserver/process-next-messages-request)
-        (bottom-sheet/hide-bottom-sheet-old)]))))
+(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])
+             [:dismiss-bottom-sheet-overlay-old]
+             (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))
@@ -67,8 +62,7 @@
         (boolean remember-choice?)
         {})
        (when (and cellular? sync?)
-          (mailserver/process-next-messages-request))
-        (wallet/restart-wallet-service nil))))))
+          (mailserver/process-next-messages-request)))))))

 (rf/defn mobile-network-continue-syncing
  {:events [:mobile-network/continue-syncing]}
@@ -1,6 +1,5 @@
 (ns legacy.status-im.multiaccounts.logout.core
  (:require
-    [legacy.status-im.wallet.core :as wallet]
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
    [status-im.common.keychain.events :as keychain]
@@ -14,15 +13,14 @@
   (native-module/logout)))

 (rf/defn initialize-app-db
-  [{{:keys           [keycard initials-avatar-font-file]
-     :biometric/keys [supported-type]
-     :network/keys   [type]}
+  [{{:keys         [keycard initials-avatar-font-file biometrics]
+     :network/keys [type]}
    :db}]
  {:db (assoc db/app-db
              :network/type              type
              :initials-avatar-font-file initials-avatar-font-file
              :keycard                   (dissoc keycard :secrets :pin :application-info)
-              :biometric/supported-type  supported-type
+              :biometrics                biometrics
              :syncing                   nil)})

 (rf/defn logout-method
@@ -31,7 +29,6 @@
  (let [key-uid (get-in db [:profile/profile :key-uid])]
    (rf/merge cofx
              {:set-root                               :progress
-               :chat.ui/clear-inputs                   nil
               :effects.shell/reset-state              nil
               :hide-popover                           nil
               ::logout                                nil
@@ -40,7 +37,6 @@
               :profile/get-profiles-overview          #(rf/dispatch
                                                         [:profile/get-profiles-overview-success %])}
              (keychain/save-auth-method key-uid auth-method)
-              (wallet/clear-timeouts)
              (initialize-app-db))))

 (rf/defn logout
@@ -49,6 +45,7 @@
  [_]
  ;; we need to disable notifications before starting the logout process
  {:effects/push-notifications-disable nil
+   :dispatch                           [:alert-banners/remove-all]
   :dispatch-later                     [{:ms       100
                                         :dispatch [::logout-method
                                                    {:auth-method keychain/auth-method-none
@@ -1,11 +1,6 @@
 (ns legacy.status-im.network.core
  (:require
-    [clojure.string :as string]
-    [re-frame.core :as re-frame]
-    [status-im.navigation.events :as navigation]
-    [utils.ethereum.chain :as chain]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
+    [clojure.string :as string]))

 (def url-regex
  #"https?://(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}(\.[a-z]{2,6})?\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)")
@@ -14,12 +9,6 @@
  [url]
  (boolean (re-matches url-regex (str url))))

-(def default-manage
-  {:name   {:value ""}
-   :url    {:value ""}
-   :symbol {:value ""}
-   :chain  {:value :mainnet}})
-
 (defn validate-string
  [{:keys [value]}]
  {:value value
@@ -56,123 +45,3 @@
  [current-networks network]
  (let [chain-id (get-in network [:config :NetworkId])]
    (every? #(not= chain-id (get-in % [1 :config :NetworkId])) current-networks)))
-
-(defn get-network
-  [{:keys [db]} network-id]
-  (get-in db [:networks/networks network-id]))
-
-(rf/defn set-input
-  {:events [::input-changed]}
-  [{:keys [db]} input-key value]
-  {:db (-> db
-           (update-in [:networks/manage input-key] assoc :value value)
-           (update-in [:networks/manage] validate-manage))})
-
-;; No edit functionality actually implemented
-(rf/defn edit
-  {:events [::add-network-pressed]}
-  [{db :db}]
-  {:db       (assoc db :networks/manage (validate-manage default-manage))
-   :dispatch [:navigate-to :edit-network]})
-
-(rf/defn connect-success
-  {:events [::connect-success]}
-  [_ network-id]
-  {:ui/show-confirmation
-   {:title               (i18n/label :t/close-app-title)
-    :content             (i18n/label :t/logout-app-content)
-    :confirm-button-text (i18n/label :t/close-app-button)
-    :on-accept           #(re-frame/dispatch [::save-network-settings-pressed network-id])
-    :on-cancel           nil}})
-
-(rf/defn connect-failure
-  {:events [::connect-failure]}
-  [_ reason]
-  {:effects.utils/show-popup
-   {:title   (i18n/label :t/error)
-    :content (str reason)}})
-
-(rf/defn connect
-  {:events [::connect-network-pressed]}
-  [{:keys [db] :as cofx} network-id]
-  (if (get-in db [:networks/networks network-id :config])
-    (connect-success cofx network-id)
-    (connect-failure cofx "A network with the specified id doesn't exist")))
-
-(rf/defn delete
-  {:events [::delete-network-pressed]}
-  [{:keys [db]} network]
-  (let [current-network? (= (:networks/current-network db) network)]
-    (if (or current-network?
-            (not (get-in db [:networks/networks network])))
-      {:ui/show-error (i18n/label :t/delete-network-error)}
-      {:ui/show-confirmation {:title               (i18n/label :t/delete-network-title)
-                              :content             (i18n/label :t/delete-network-confirmation)
-                              :confirm-button-text (i18n/label :t/delete)
-                              :on-accept           #(re-frame/dispatch [::remove-network-confirmed
-                                                                        network])
-                              :on-cancel           nil}})))
-
-(rf/defn save-network-settings
-  {:events [::save-network-settings-pressed]}
-  [{:keys [db] :as cofx} network]
-  {:db            (assoc db :networks/current-network network)
-   :json-rpc/call [{:method     "settings_saveSetting"
-                    :params     [:networks/current-network network]
-                    :on-success #(re-frame/dispatch [:logout])}]})
-
-(rf/defn remove-network
-  {:events [::remove-network-confirmed]}
-  [{:keys [db] :as cofx} network]
-  (let [networks (dissoc (:networks/networks db) network)]
-    {:db            (assoc db :networks/networks networks)
-     :json-rpc/call [{:method     "settings_saveSetting"
-                      :params     [:networks/networks (vals networks)]
-                      :on-success #(re-frame/dispatch [:navigate-back])}]}))
-
-(defn new-network
-  [random-id network-name sym upstream-url chain-type chain-id]
-  (let [data-dir (str "/ethereum/" (name chain-type) "_rpc")
-        config   {:NetworkId      (or (when chain-id (int chain-id))
-                                      (chain/chain-keyword->chain-id chain-type))
-                  :DataDir        data-dir
-                  :UpstreamConfig {:Enabled true
-                                   :URL     upstream-url}}]
-    {:id     random-id
-     :name   network-name
-     :symbol sym
-     :config config}))
-
-(rf/defn save
-  {:events       [::save-network-pressed]
-   :interceptors [(re-frame/inject-cofx :random-id-generator)]}
-  [{{:networks/keys [manage networks] :as db} :db
-    random-id-generator                       :random-id-generator
-    :as                                       cofx}]
-  (if (valid-manage? manage)
-    ;; rename network-id from UI to chain-id
-    (let [{:keys [name url chain network-id symbol]} manage
-          random-id                                  (string/replace (random-id-generator) "-" "")
-          network                                    (new-network random-id
-                                                                  (:value name)
-                                                                  (:value symbol)
-                                                                  (:value url)
-                                                                  (:value chain)
-                                                                  (:value network-id))
-          custom-chain-type?                         (= :custom (:value chain))
-          new-networks                               (assoc networks random-id network)]
-      (if (or (not custom-chain-type?)
-              (chain-id-available? networks network))
-        {:db            (-> db
-                            (dissoc :networks/manage)
-                            (assoc :networks/networks new-networks))
-         :json-rpc/call [{:method     "settings_saveSetting"
-                          :params     [:networks/networks (vals new-networks)]
-                          :on-success #(re-frame/dispatch [:navigate-back])}]}
-        {:ui/show-error "chain-id already defined"}))
-    {:ui/show-error "invalid network parameters"}))
-
-(rf/defn open-network-details
-  {:events [::network-entry-pressed]}
-  [cofx network]
-  (navigation/navigate-to cofx :network-details {:networks/selected-network network}))
@@ -31,38 +31,6 @@
  (testing "an https url not on the default port"
    (is (network.core/valid-rpc-url? "https://valid.something.else:65323"))))

-(deftest new-network-test
-  (let [actual (network.core/new-network "randomid"
-                                         "network-name"
-                                         "network-symbol"
-                                         "upstream-url"
-                                         :mainnet
-                                         nil)]
-    (is (= {:id     "randomid"
-            :name   "network-name"
-            :symbol "network-symbol"
-            :config {:NetworkId      1
-                     :DataDir        "/ethereum/mainnet_rpc"
-                     :UpstreamConfig {:Enabled true
-                                      :URL     "upstream-url"}}}
-           actual))))
-
-(deftest new-network-id-test
-  (let [actual (network.core/new-network "randomid"
-                                         "network-name"
-                                         "network-symbol"
-                                         "upstream-url"
-                                         :mainnet
-                                         "5777")]
-    (is (= {:id     "randomid"
-            :name   "network-name"
-            :symbol "network-symbol"
-            :config {:NetworkId      5777
-                     :DataDir        "/ethereum/mainnet_rpc"
-                     :UpstreamConfig {:Enabled true
-                                      :URL     "upstream-url"}}}
-           actual))))
-
 (deftest valid-manage-test
  (testing "a valid manage"
    (is (network.core/valid-manage? {:url    {:value "http://valid.com"}
@@ -92,101 +60,3 @@
                                          :name   {:value "valid"}
                                          :symbol {:value ""}
                                          :chain  {:value "valid"}})))))
-
-(deftest set-input-test
-  (testing "it updates and validate a field"
-    (is
-     (= {:db {:networks/manage {:url        {:value "http://valid.com"
-                                             :error false}
-                                :name       {:value ""
-                                             :error true}
-                                :symbol     {:value "symbol"
-                                             :error false}
-                                :chain      {:value "mainnet"
-                                             :error false}
-                                :network-id {:value nil
-                                             :error false}}}}
-        (network.core/set-input {:db {:networks/manage {:url    {:value "something"
-                                                                 :error true}
-                                                        :name   {:value ""
-                                                                 :error false}
-                                                        :symbol {:value "symbol"
-                                                                 :error false}
-                                                        :chain  {:value "mainnet"
-                                                                 :error false}}}}
-                                :url
-                                "http://valid.com")))))
-
-(deftest not-save-invalid-url
-  (testing "it does not save a network with an invalid url"
-    (is
-     (:ui/show-error (network.core/save {:random-id-generator (constantly "random")
-                                         :db                  {:networks/manage {:url   {:value "wrong"}
-                                                                                 :chain {:value "1"}
-                                                                                 :name  {:value "empty"}}
-                                                               :profile/profile {}}})))))
-
-(deftest save-valid-network
-  (testing "save a valid network"
-    (let [fx (network.core/save
-              {:random-id-generator (constantly "random-id")
-               :db                  {:networks/manage   {:url    {:value "http://valid.com"}
-                                                         :chain  {:value :mainnet}
-                                                         :symbol {:value "symbol"}
-                                                         :name   {:value "valid"}}
-                                     :profile/profile   {}
-                                     :networks/networks {"random2"
-                                                         {:id     "random2"
-                                                          :name   "network-name"
-                                                          :symbol "symbol"
-                                                          :config {:NetworkId 1
-                                                                   :DataDir "/ethereum/mainnet_rpc"
-                                                                   :UpstreamConfig
-                                                                   {:Enabled true
-                                                                    :URL     "upstream-url"}}}}}})]
-      (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
-      (is (nil? (:networks/manage (:db fx))))
-      (testing "and check that it has an id with `-` and the correct mainnet NetworkId"
-        (is (= 1 (get-in fx [:db :networks/networks "randomid" :config :NetworkId])))))))
-
-(deftest not-save-custom-chain-with-non-unique-id
-  (testing "it does not save a custom chain with network-id already defined"
-    (let [result (network.core/save
-                  {:random-id-generator (constantly "already-defined")
-                   :db                  {:networks/manage   {:url        {:value "http://valid.com"}
-                                                             :chain      {:value :custom}
-                                                             :name       {:value "valid"}
-                                                             :network-id {:value 1}}
-                                         :profile/profile   {}
-                                         :networks/networks {"random"
-                                                             {:id     "random"
-                                                              :name   "network-name"
-                                                              :config {:NetworkId 1
-                                                                       :DataDir "/ethereum/mainnet_rpc"
-                                                                       :UpstreamConfig
-                                                                       {:Enabled true
-                                                                        :URL     "upstream-url"}}}}}})]
-      (is (:ui/show-error result)))))
-
-(deftest save-valid-network-with-unique-chain-id-check
-  (testing "save a valid network with chain-id not already defined"
-    (let [fx (network.core/save
-              {:random-id-generator (constantly "random")
-               :db                  {:networks/manage   {:url        {:value "http://valid.com"}
-                                                         :chain      {:value :mainnet}
-                                                         :name       {:value "valid"}
-                                                         :symbol     {:value "symbol"}
-                                                         :network-id {:value 5}}
-                                     :profile/profile   {}
-                                     :networks/networks {"randomid"
-                                                         {:id     "randomid"
-                                                          :name   "network-name"
-                                                          :symbol "symbol"
-                                                          :config {:NetworkId 3
-                                                                   :DataDir "/ethereum/mainnet_rpc"
-                                                                   :UpstreamConfig
-                                                                   {:Enabled true
-                                                                    :URL     "upstream-url"}}}}}})]
-      (is (= "settings_saveSetting" (:method (first (:json-rpc/call fx)))))
-      (is (nil? (:networks/manage (:db fx))))
-      (is (get-in fx [:db :networks/networks "random"])))))
@@ -1,8 +1,6 @@
 (ns legacy.status-im.network.net-info
  (:require
    ["@react-native-community/netinfo" :default net-info]
-    [legacy.status-im.mobile-sync-settings.core :as mobile-network]
-    [legacy.status-im.wallet.core :as wallet]
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
    [taoensso.timbre :as log]
@@ -11,19 +9,14 @@
 (rf/defn change-network-status
  [{:keys [db] :as cofx} is-connected?]
  (rf/merge cofx
-            {:db (assoc db :network-status (if is-connected? :online :offline))}
-            (when (and is-connected?
-                       (or (not= (count (get-in db [:wallet-legacy :accounts]))
-                                 (count (get db :profile/wallet-accounts)))
-                           (wallet/has-empty-balances? db)))
-              (wallet/update-balances nil nil))))
+            {:db (assoc db :network-status (if is-connected? :online :offline))}))

 (rf/defn change-network-type
-  [{:keys [db] :as cofx} old-network-type network-type expensive?]
+  [{:keys [db] :as cofx} network-type expensive?]
  (rf/merge cofx
            {:db                       (assoc db :network/type network-type)
-             :network/notify-status-go [network-type expensive?]}
-            (mobile-network/on-network-status-change)))
+             :network/notify-status-go [network-type expensive?]
+             :dispatch                 [:mobile-network/on-network-status-change]}))

 (rf/defn handle-network-info-change
  {:events [::network-info-changed]}
@@ -43,7 +36,7 @@
              (when-not status-changed?
                (change-network-status isConnected))
              (when-not type-changed?
-                (change-network-type old-network-type type (:is-connection-expensive details))))))
+                (change-network-type type (:is-connection-expensive details))))))

 (defn add-net-info-listener
  []
@@ -72,18 +72,3 @@
  {:events [:show-tooltip]}
  [_ tooltip-id]
  {:show-tooltip tooltip-id})
-
-(rf/defn show-profile
-  {:events [:chat.ui/show-profile]}
-  [{:keys [db]} identity ens-name]
-  (let [my-public-key (get-in db [:profile/profile :public-key])]
-    (if (not= my-public-key identity)
-      {:db       (-> db
-                     (assoc :contacts/identity identity)
-                     (assoc :contacts/ens-name ens-name))
-       :dispatch [:contacts/build-contact
-                  {:pubkey     identity
-                   :ens        ens-name
-                   :success-fn (fn [_]
-                                 {:dispatch [:open-modal :profile]})}]}
-      {:dispatch [:navigate-to :my-profile]})))
@@ -1,59 +0,0 @@
-(ns legacy.status-im.search.core-test
-  (:require
-    [cljs.test :refer-macros [deftest testing is]]
-    [legacy.status-im.subs.wallet.search :as search.subs]))
-
-(defn extract-chat-attributes
-  [chat]
-  (let [{:keys [name alias tags]} (val chat)]
-    (into [name alias] tags)))
-
-(deftest filter-chats
-  (let [chats {:chat-1 {:name  "name1"
-                        :alias "alias1"
-                        :tags  #{"tag1"}}
-               :chat-2 {:name  "name2"
-                        :alias "alias2"
-                        :tags  #{"tag2" "tag3"}}
-               :chat-3 {:name  "name3"
-                        :alias "alias3"
-                        :tags  #{}}
-               :chat-4 {:name  "name4"
-                        :alias "alias4"
-                        :tags  #{"tag4"}}}]
-    (testing "no search filter"
-      (is (= (count chats)
-             (count (search.subs/apply-filter ""
-                                              chats
-                                              extract-chat-attributes
-                                              false)))))
-    (testing "searching for a specific tag"
-      (is (= 1
-             (count (search.subs/apply-filter "tag2"
-                                              chats
-                                              extract-chat-attributes
-                                              false)))))
-    (testing "searching for a partial tag"
-      (is (= 3
-             (count (search.subs/apply-filter "tag"
-                                              chats
-                                              extract-chat-attributes
-                                              false)))))
-    (testing "searching for a specific alias"
-      (is (= 1
-             (count (search.subs/apply-filter "alias4"
-                                              chats
-                                              extract-chat-attributes
-                                              false)))))
-    (testing "searching for a partial alias"
-      (is (= 4
-             (count (search.subs/apply-filter "alias"
-                                              chats
-                                              extract-chat-attributes
-                                              false)))))
-    (testing "searching for a specific chat name"
-      (is (= 1
-             (count (search.subs/apply-filter "name4"
-                                              chats
-                                              extract-chat-attributes
-                                              false)))))))
@@ -10,9 +10,6 @@
    [legacy.status-im.utils.deprecated-types :as types]
    [legacy.status-im.utils.hex :as utils.hex]
    [legacy.status-im.utils.utils :as utils]
-    [legacy.status-im.wallet.core :as wallet]
-    [legacy.status-im.wallet.prices :as prices]
-    [legacy.status-im.wallet.utils :as wallet.utils]
    [native-module.core :as native-module]
    [re-frame.core :as re-frame]
    [status-im.common.json-rpc.events :as json-rpc]
@@ -83,7 +80,7 @@
  [{{:signing/keys [sign tx] :as db} :db}]
  (let [{{:keys [data typed? from v4]} :message} tx
        {:keys [in-progress? password]}          sign
-        from                                     (or from (wallet.utils/default-address db))
+        from                                     from
        hashed-password                          (native-module/sha3 (security/safe-unmask-data
                                                                      password))]
    (when-not in-progress?
@@ -335,7 +332,7 @@
        :dismiss-keyboard   nil}
       #(when-not wallet-set-up-passed?
          {:dispatch-later [{:dispatch [:show-popover {:view :signing-phrase}] :ms 200}]})
-       (prices/update-prices)
+
       #(when-not gas
          {:db                           (assoc-in (:db %) [:signing/edit-fee :gas-loading?] true)
           :signing/update-estimated-gas {:obj           (-> tx-obj
@@ -395,7 +392,6 @@
               :signing/show-transaction-result nil}
              (prepare-unconfirmed-transaction result tx-obj symbol amount)
              (check-queue)
-              (wallet/watch-tx (get from :address) result)
              #(when on-result
                 {:dispatch (conj on-result result)}))))

@@ -408,7 +404,6 @@
    (rf/merge
     cofx
     {:db (dissoc db :signing/tx :signing/sign)}
-     (wallet/watch-tx (get from :address) transaction-hash)
     (if (keycard.common/keycard-multiaccount? db)
       (signing.keycard/hash-message
        {:data data
@@ -511,8 +506,8 @@
                 {:dispatch (conj on-error "transaction was cancelled by user")}))))

 (defn normalize-tx-obj
-  [db tx]
-  (update-in tx [:tx-obj :from] #(eip55/address->checksum (or % (wallet.utils/default-address db)))))
+  [_db tx]
+  (update-in tx [:tx-obj :from] #(eip55/address->checksum %)))

 (rf/defn sign
  "Signing transaction or message, shows signing sheet
@@ -1,8 +1,8 @@
 (ns legacy.status-im.stickers.core
  (:require
    [legacy.status-im.utils.utils :as utils]
-    [legacy.status-im.wallet.utils :as wallet.utils]
    [re-frame.core :as re-frame]
+    [status-im.common.json-rpc.events :as json-rpc]
    [status-im.constants :as constants]
    [utils.ethereum.chain :as chain]
    [utils.re-frame :as rf]))
@@ -23,6 +23,21 @@
                     :params     [(chain/chain-id db) id]
                     :on-success #()}]}))

+(re-frame/reg-fx :stickers/load-packs
+ (fn [chain-id]
+   (json-rpc/call {:method     "stickers_market"
+                   :params     [chain-id]
+                   :on-success [:stickers/stickers-market-success]})
+   (json-rpc/call {:method     "stickers_installed"
+                   :params     []
+                   :on-success [:stickers/stickers-installed-success]})
+   (json-rpc/call {:method     "stickers_pending"
+                   :params     []
+                   :on-success [:stickers/stickers-pending-success]})
+   (json-rpc/call {:method     "stickers_recent"
+                   :params     []
+                   :on-success [:stickers/stickers-recent-success]})))
+
 (rf/defn load-packs
  {:events [:stickers/load-packs]}
  [{:keys [db]}]
@@ -39,15 +54,6 @@
                    :params     []
                    :on-success #(re-frame/dispatch [:stickers/stickers-recent-success %])}]})

-(rf/defn buy-pack
-  {:events [:stickers/buy-pack]}
-  [{db :db} pack-id]
-  {:json-rpc/call [{:method     "stickers_buyPrepareTx"
-                    :params     [(chain/chain-id db) (wallet.utils/default-address db) (int pack-id)]
-                    :on-success #(re-frame/dispatch [:signing.ui/sign
-                                                     {:tx-obj    %
-                                                      :on-result [:stickers/pending-pack pack-id]}])}]})
-
 (rf/defn pending-pack
  {:events [:stickers/pending-pack]}
  [{db :db} id]
@@ -61,7 +61,7 @@
 (re-frame/reg-sub
 :mailserver/use-status-nodes?
 (fn [db _]
-   (boolean (mailserver/fetch-use-mailservers? {:db db}))))
+   (boolean (mailserver/fetch-use-mailservers? db))))

 (re-frame/reg-sub
 :mailserver.edit/validation-errors
@@ -1,39 +0,0 @@
-(ns legacy.status-im.subs.networks
-  (:require
-    [re-frame.core :as re-frame]
-    [status-im.config :as config]
-    [utils.ethereum.chain :as chain]))
-
-(defn- filter-networks
-  [network-type]
-  (fn [network]
-    (let [chain-id (chain/network->chain-id network)
-          testnet? (chain/testnet? chain-id)
-          custom?  (:custom? network)]
-      (case network-type
-        :custom  custom?
-        :mainnet (and (not custom?) (not testnet?))
-        :testnet (and (not custom?) testnet?)))))
-
-(defn- label-networks
-  [default-networks]
-  (fn [network]
-    (let [custom? (not (default-networks (:id network)))]
-      (assoc network :custom? custom?))))
-
-(re-frame/reg-sub
- :get-networks
- :<- [:networks/networks]
- (fn [networks]
-   (let [networks (map (label-networks (into #{} (map :id config/default-networks)))
-                       (sort-by :name (vals networks)))
-         types    [:mainnet :testnet :custom]]
-     (zipmap
-      types
-      (map #(filter (filter-networks %) networks) types)))))
-
-(re-frame/reg-sub
- :manage-network-valid?
- :<- [:networks/manage]
- (fn [manage]
-   (not-any? :error (vals manage))))
@@ -5,12 +5,7 @@
    legacy.status-im.subs.ens
    legacy.status-im.subs.keycard
    legacy.status-im.subs.mailservers
-    legacy.status-im.subs.networks
    legacy.status-im.subs.stickers
-    legacy.status-im.subs.wallet.search
-    legacy.status-im.subs.wallet.signing
-    legacy.status-im.subs.wallet.transactions
-    legacy.status-im.subs.wallet.wallet
    [re-frame.core :as re-frame]))

 (defn reg-root-key-sub
@@ -104,6 +99,7 @@
 ;;; Link previews
 (reg-root-key-sub :link-previews-whitelist :link-previews-whitelist)
 (reg-root-key-sub :chat/link-previews :chat/link-previews)
+(reg-root-key-sub :chat/status-link-previews :chat/status-link-previews)

 ;;commands
 (reg-root-key-sub :commands/select-account :commands/select-account)
@@ -1,73 +0,0 @@
-(ns legacy.status-im.subs.wallet.search
-  (:require
-    [clojure.string :as string]
-    [legacy.status-im.utils.currency :as currency]
-    [re-frame.core :as re-frame]))
-
-(defn sort-by-timestamp
-  [coll]
-  (when (not-empty coll)
-    (sort-by #(-> % second :timestamp)
-             >
-             (into {} coll))))
-
-(defn apply-filter
-  "extract-attributes-fn is a function that take an element from the collection
-  and returns a vector of attributes which are strings
-  apply-filter returns the elements for which at least one attribute includes
-  the search-filter
-  apply-filter returns nil if there is no element that match the filter
-  apply-filter returns full collection if the search-filter is empty"
-  [search-filter coll extract-attributes-fn sort?]
-  (let [results (if (not-empty search-filter)
-                  (let [search-filter (string/lower-case search-filter)]
-                    (filter (fn [element]
-                              (some (fn [v]
-                                      (let [s (cond (string? v)  v
-                                                    (keyword? v) (name v))]
-                                        (when (string? s)
-                                          (string/includes? (string/lower-case s)
-                                                            search-filter))))
-                                    (extract-attributes-fn element)))
-                            coll))
-                  coll)]
-    (if sort?
-      (sort-by-timestamp results)
-      results)))
-
-(defn extract-currency-attributes
-  [currency]
-  (let [{:keys [code display-name]} (val currency)]
-    [code display-name]))
-
-(re-frame/reg-sub
- :wallet-legacy/search-filtered-currencies
- :<- [:search/currency-filter]
- (fn [search-currency-filter]
-   {:search-filter search-currency-filter
-    :currencies    (apply-filter search-currency-filter
-                                 currency/currencies
-                                 extract-currency-attributes
-                                 false)}))
-
-(defn extract-token-attributes
-  [token]
-  [(:symbol token) (:name token)])
-
-(re-frame/reg-sub
- :wallet-legacy/search-token-filter
- :<- [:ui/search]
- (fn [search]
-   (get search :token-filter)))
-
-(re-frame/reg-sub
- :wallet-legacy/filtered-grouped-chain-tokens
- :<- [:wallet-legacy/grouped-chain-tokens]
- :<- [:wallet-legacy/search-token-filter]
- (fn [[{custom-tokens true default-tokens nil} search-token-filter]]
-   {:search-filter search-token-filter
-    :tokens        {true (apply-filter search-token-filter custom-tokens extract-token-attributes false)
-                    nil  (apply-filter search-token-filter
-                                       default-tokens
-                                       extract-token-attributes
-                                       false)}}))
@@ -1,235 +0,0 @@
-(ns legacy.status-im.subs.wallet.signing
-  (:require
-    [clojure.string :as string]
-    [legacy.status-im.ethereum.tokens :as tokens]
-    [legacy.status-im.signing.gas :as signing.gas]
-    [legacy.status-im.wallet.db :as wallet.db]
-    [re-frame.core :as re-frame]
-    [utils.ethereum.chain :as chain]
-    [utils.i18n :as i18n]
-    [utils.money :as money]))
-
-(re-frame/reg-sub
- ::send-transaction
- :<- [:wallet-legacy]
- (fn [wallet]
-   (:send-transaction wallet)))
-
-(re-frame/reg-sub
- :wallet-legacy.send/symbol
- :<- [::send-transaction]
- (fn [send-transaction]
-   (:symbol send-transaction)))
-
-(re-frame/reg-sub
- :wallet-legacy.send/camera-flashlight
- :<- [::send-transaction]
- (fn [send-transaction]
-   (:camera-flashlight send-transaction)))
-
-(re-frame/reg-sub
- :wallet-legacy/settings
- :<- [:wallet-legacy]
- (fn [{:keys [settings]}]
-   (reduce-kv #(conj %1 %3) [] settings)))
-
-(re-frame/reg-sub
- :wallet-legacy.request/transaction
- :<- [:wallet-legacy]
- :request-transaction)
-
-(re-frame/reg-sub
- :wallet-legacy/binance-chain?
- :<- [:current-network]
- (fn [network]
-   (chain/binance-chain-id? (get-in network [:config :NetworkId]))))
-
-(re-frame/reg-sub
- :signing/fee
- :<- [:signing/tx]
- (fn [{:keys [gas gasPrice maxFeePerGas]}]
-   (signing.gas/calculate-max-fee gas (or maxFeePerGas gasPrice))))
-
-(re-frame/reg-sub
- :signing/currencies
- :<- [:prices]
- :<- [:wallet-legacy/currency]
- :<- [:ethereum/native-currency]
- (fn [[prices {:keys [code]} {sym :symbol}]]
-   [(name sym)
-    code
-    (get-in prices [sym (keyword code)])]))
-
-(re-frame/reg-sub
- :signing/priority-fee-suggestions-range
- :<- [:wallet-legacy/current-priority-fee]
- :<- [:wallet-legacy/slow-base-fee]
- :<- [:wallet-legacy/normal-base-fee]
- :<- [:wallet-legacy/fast-base-fee]
- (fn [[latest-tip slow normal fast]]
-   (reduce
-    (fn [acc [k fees]]
-      (assoc acc
-             k
-             (reduce
-              (fn [acc [k fee]]
-                (assoc acc
-                       k
-                       (-> fee
-                           money/wei->gwei
-                           (money/to-fixed 2))))
-              {}
-              fees)))
-    {}
-    (signing.gas/get-fee-options latest-tip slow normal fast))))
-
-(re-frame/reg-sub
- :signing/phrase
- :<- [:profile/profile]
- (fn [{:keys [signing-phrase]}]
-   signing-phrase))
-
-(re-frame/reg-sub
- :signing/sign-message
- :<- [:signing/sign]
- :<- [:profile/wallet-accounts]
- :<- [:prices]
- (fn [[sign wallet-accounts prices]]
-   (if (= :pinless (:type sign))
-     (let [message    (get-in sign [:formatted-data :message])
-           wallet-acc (some #(when (= (:address %) (:receiver message)) %) wallet-accounts)]
-       (cond-> sign
-         (and (:amount message) (:currency message))
-         (assoc :fiat-amount
-                (money/fiat-amount-value (:amount message)
-                                         (:currency message)
-                                         :USD
-                                         prices)
-                :fiat-currency "USD")
-         (and (:receiver message) wallet-acc)
-         (assoc :account wallet-acc)))
-     sign)))
-
-(defn- too-precise-amount?
-  "Checks if number has any extra digit beyond the allowed number of decimals.
-  It does so by checking the number against its rounded value."
-  [amount decimals]
-  (let [^js bn (money/bignumber amount)]
-    (not (.eq bn (.round bn decimals)))))
-
-(defn get-amount-error
-  [amount decimals]
-  (when (and (seq amount) decimals)
-    (let [normalized-amount (money/normalize amount)
-          value             (money/bignumber normalized-amount)]
-      (cond
-        (not (money/valid? value))
-        {:amount-error (i18n/label :t/validation-amount-invalid-number)}
-
-        (too-precise-amount? normalized-amount decimals)
-        {:amount-error (i18n/label :t/validation-amount-is-too-precise {:decimals decimals})}
-
-        :else nil))))
-
-(defn get-sufficient-funds-error
-  [balance sym amount]
-  (when-not (money/sufficient-funds? amount (get balance sym))
-    {:amount-error (i18n/label :t/wallet-insufficient-funds)}))
-
-(defn gas-required-exceeds-allowance?
-  [gas-error-message]
-  (and gas-error-message
-       (string/starts-with?
-        gas-error-message
-        "gas required exceeds allowance")))
-
-(defn get-sufficient-gas-error
-  [gas-error-message balance sym amount ^js gas ^js gasPrice]
-  (if (and gas gasPrice)
-    (let [^js fee               (.times gas gasPrice)
-          ^js available-ether   (money/bignumber (get balance :ETH 0))
-          ^js available-for-gas (if (= :ETH sym)
-                                  (.minus available-ether (money/bignumber amount))
-                                  available-ether)]
-      (merge {:gas-error-state (when gas-error-message :gas-is-set)}
-             (when-not (money/sufficient-funds? fee (money/bignumber available-for-gas))
-               {:gas-error (i18n/label :t/wallet-insufficient-gas)})))
-    (let [insufficient-balance? (gas-required-exceeds-allowance? gas-error-message)]
-      {:gas-error-state       (when gas-error-message :gas-isnt-set)
-       :insufficient-balalce? insufficient-balance?
-       :gas-error             (if insufficient-balance?
-                                (i18n/label :t/insufficient-balance-to-cover-fee)
-                                (or gas-error-message
-                                    (i18n/label :t/invalid-number)))})))
-
-(re-frame/reg-sub
- :signing/amount-errors
- (fn [[_ address] _]
-   [(re-frame/subscribe [:signing/tx])
-    (re-frame/subscribe [:balance address])])
- (fn [[{:keys [amount token gas gasPrice maxFeePerGas approve? gas-error-message]} balance]]
-   (let [gas-price (or maxFeePerGas gasPrice)]
-     (if (and amount token (not approve?))
-       (let [amount-bn    (money/formatted->internal (money/bignumber amount)
-                                                     (:symbol token)
-                                                     (:decimals token))
-             amount-error (or (get-amount-error amount (:decimals token))
-                              (get-sufficient-funds-error balance (:symbol token) amount-bn))]
-         (merge
-          amount-error
-          (get-sufficient-gas-error gas-error-message balance (:symbol token) amount-bn gas gas-price)))
-       (get-sufficient-gas-error gas-error-message balance nil nil gas gas-price)))))
-
-(re-frame/reg-sub
- :wallet-legacy.send/prepare-transaction-with-balance
- :<- [:wallet-legacy/prepare-transaction]
- :<- [:wallet-legacy]
- :<- [:offline?]
- :<- [:wallet-legacy/all-tokens]
- :<- [:current-network]
- (fn [[{:keys [from to amount-text] :as transaction}
-       wallet offline? all-tokens current-network]]
-   (let [sym (:symbol transaction)
-         balance (get-in wallet [:accounts (:address from) :balance])
-         {:keys [decimals] :as token} (tokens/asset-for all-tokens current-network sym)
-         {:keys [value error]} (wallet.db/parse-amount amount-text decimals)
-         amount (money/formatted->internal value sym decimals)
-         {:keys [amount-error] :as transaction-new}
-         (merge transaction
-                {:amount-error error}
-                (when amount
-                  (get-sufficient-funds-error balance sym amount)))]
-     (assoc transaction-new
-            :amount        amount
-            :balance       balance
-            :token         (assoc token :amount (get balance (:symbol token)))
-            :sign-enabled? (and to
-                                (nil? amount-error)
-                                (not (nil? amount))
-                                (not offline?))))))
-
-(re-frame/reg-sub
- :wallet-legacy.request/prepare-transaction-with-balance
- :<- [:wallet-legacy/prepare-transaction]
- :<- [:wallet-legacy]
- :<- [:offline?]
- :<- [:wallet-legacy/all-tokens]
- :<- [:current-network]
- (fn [[{:keys [from to amount-text] :as transaction}
-       wallet offline? all-tokens current-network]]
-   (let [sym (:symbol transaction)
-         balance (get-in wallet [:accounts (:address from) :balance])
-         {:keys [decimals] :as token} (tokens/asset-for all-tokens current-network sym)
-         {:keys [value error]} (wallet.db/parse-amount amount-text decimals)
-         amount (money/formatted->internal value sym decimals)
-         {:keys [amount-error] :as transaction-new}
-         (assoc transaction :amount-error error)]
-     (assoc transaction-new
-            :amount        amount
-            :balance       balance
-            :token         (assoc token :amount (get balance (:symbol token)))
-            :sign-enabled? (and to
-                                from
-                                (nil? amount-error)
-                                (not (nil? amount))
-                                (not offline?))))))
@@ -1,247 +0,0 @@
-(ns legacy.status-im.subs.wallet.transactions
-  (:require
-    [legacy.status-im.ethereum.transactions.core :as transactions]
-    [legacy.status-im.notifications.wallet :as notifications.wallet]
-    [legacy.status-im.wallet.db :as wallet.db]
-    [legacy.status-im.wallet.utils :as wallet.utils]
-    [re-frame.core :as re-frame]
-    [utils.datetime :as datetime]
-    [utils.i18n :as i18n]
-    [utils.money :as money]))
-
-(re-frame/reg-sub
- :wallet-legacy/accounts
- :<- [:wallet-legacy]
- (fn [wallet]
-   (get wallet :accounts)))
-
-(re-frame/reg-sub
- :wallet-legacy/account-by-transaction-hash
- :<- [:wallet-legacy/accounts]
- (fn [accounts [_ tx-hash]]
-   (some (fn [[address account]]
-           (when-let [transaction (get-in account [:transactions tx-hash])]
-             (assoc transaction :address address)))
-         accounts)))
-
-(re-frame/reg-sub
- :wallet-legacy/transactions
- :<- [:wallet-legacy]
- (fn [wallet [_ address]]
-   (get-in wallet [:accounts address :transactions])))
-
-(re-frame/reg-sub
- :wallet-legacy/filters
- :<- [:wallet-legacy]
- (fn [wallet]
-   (get wallet :filters)))
-
-(defn enrich-transaction
-  [{:keys [type to from value token] :as transaction}
-   contacts native-currency]
-  (let [[contact-address key-contact key-wallet]
-        (if (= type :inbound)
-          [from :from-contact :to-wallet]
-          [to :to-contact :from-wallet])
-        wallet (i18n/label :t/main-wallet)
-        contact (get contacts contact-address)
-        {:keys [symbol-display decimals] :as asset}
-        (or token native-currency)
-        amount-text (if value
-                      (wallet.utils/format-amount value decimals)
-                      "...")
-        currency-text (when asset
-                        (clojure.core/name (or symbol-display
-                                               (:symbol asset))))]
-    (cond-> transaction
-      contact (assoc key-contact (:name contact))
-      :always (assoc key-wallet
-                     wallet
-                     :amount-text   amount-text
-                     :currency-text currency-text))))
-
-(re-frame/reg-sub
- :wallet-legacy.transactions/transactions
- (fn [[_ address] _]
-   [(re-frame/subscribe [:wallet-legacy/transactions address])
-    (re-frame/subscribe [:contacts/contacts-by-address])
-    (re-frame/subscribe [:ethereum/native-currency])])
- (fn [[transactions contacts native-currency]]
-   (reduce (fn [acc [tx-hash transaction]]
-             (assoc acc
-                    tx-hash
-                    (enrich-transaction transaction contacts native-currency))) ;;TODO this doesn't
-           ;;look good for performance, we need to calculate this only once for each transaction
-           {}
-           transactions)))
-
-(re-frame/reg-sub
- :wallet-legacy.transactions/all-filters?
- :<- [:wallet-legacy/filters]
- (fn [filters]
-   (= wallet.db/default-wallet-filters
-      filters)))
-
-(def filters-labels
-  {:inbound  (i18n/label :t/incoming)
-   :outbound (i18n/label :t/outgoing)
-   :pending  (i18n/label :t/pending)
-   :failed   (i18n/label :t/failed)})
-
-(re-frame/reg-sub
- :wallet-legacy.transactions/filters
- :<- [:wallet-legacy/filters]
- (fn [filters]
-   (map (fn [id]
-          (let [checked? (filters id)]
-            {:id       id
-             :label    (filters-labels id)
-             :checked? checked?
-             :on-touch #(if checked?
-                          (re-frame/dispatch [:wallet-legacy.transactions/remove-filter id])
-                          (re-frame/dispatch [:wallet-legacy.transactions/add-filter id]))}))
-        wallet.db/default-wallet-filters)))
-
-(re-frame/reg-sub
- :wallet-legacy.transactions.filters/screen
- :<- [:wallet-legacy.transactions/filters]
- :<- [:wallet-legacy.transactions/all-filters?]
- (fn [[filters all-filters?]]
-   {:all-filters?        all-filters?
-    :filters             filters
-    :on-touch-select-all (when-not all-filters?
-                           #(re-frame/dispatch
-                             [:wallet-legacy.transactions/add-all-filters]))}))
-
-(defn- enrich-transaction-for-list
-  [filters
-   {:keys [type from-contact from to-contact to timestamp] :as transaction}
-   address]
-  (when (filters type)
-    (assoc
-     (case type
-       :inbound
-       (assoc transaction
-              :label                       (i18n/label :t/from-capitalized)
-              :contact-accessibility-label :sender-text
-              :address-accessibility-label :sender-address-text
-              :contact                     from-contact
-              :address                     from)
-       (assoc transaction
-              :label                       (i18n/label :t/to-capitalized)
-              :contact-accessibility-label :recipient-name-text
-              :address-accessibility-label :recipient-address-text
-              :contact                     to-contact
-              :address                     to))
-     :time-formatted (datetime/timestamp->time timestamp)
-     :on-touch-fn    #(re-frame/dispatch [:wallet-legacy.ui/show-transaction-details
-                                          (:hash transaction)
-                                          address]))))
-
-(defn group-transactions-by-date
-  [transactions]
-  (->> transactions
-       (group-by #(datetime/timestamp->date-key (:timestamp %)))
-       (sort-by key >)
-       (map (fn [[date-key transactions]]
-              {:title (datetime/timestamp->mini-date (:timestamp (first transactions)))
-               :key   date-key
-               :data  (sort-by :timestamp > transactions)}))))
-
-(re-frame/reg-sub
- :wallet-legacy.transactions.history/screen
- (fn [[_ address] _]
-   [(re-frame/subscribe [:wallet-legacy.transactions/transactions address])
-    (re-frame/subscribe [:wallet-legacy/filters])
-    (re-frame/subscribe [:wallet-legacy.transactions/all-filters?])])
- (fn [[transactions filters all-filters?] [_ address]]
-   {:all-filters? all-filters?
-    :total (count transactions)
-    :transaction-history-sections
-    (->> transactions
-         vals
-         (keep #(enrich-transaction-for-list filters % address))
-         (group-transactions-by-date))}))
-
-(re-frame/reg-sub
- :wallet-legacy/recipient-recent-txs
- (fn [[_ address] _]
-   [(re-frame/subscribe [:wallet-legacy.transactions/transactions address])])
- (fn [[transactions] _]
-   (->> transactions
-        vals
-        (sort-by :timestamp >)
-        (remove #(= (:type %) :pending))
-        (take 3))))
-
-(re-frame/reg-sub
- :wallet-legacy.transactions.details/current-transaction
- (fn [[_ _ address] _]
-   [(re-frame/subscribe [:wallet-legacy.transactions/transactions address])
-    (re-frame/subscribe [:ethereum/native-currency])
-    (re-frame/subscribe [:chain-id])])
- (fn [[transactions native-currency chain-id] [_ tx-hash _]]
-   (let [{:keys [gas-used gas-price fee-cap tip-cap timestamp type]
-          :as   transaction}
-         (get transactions tx-hash)
-         native-currency-text (name (or (:symbol-display native-currency)
-                                        (:symbol native-currency)))]
-     (when transaction
-       (merge transaction
-              {:gas-price-eth  (if gas-price
-                                 (money/wei->str :eth
-                                                 gas-price
-                                                 native-currency-text)
-                                 "-")
-               :gas-price-gwei (if gas-price
-                                 (money/wei->str :gwei
-                                                 gas-price)
-                                 "-")
-               :fee-cap-gwei   (if fee-cap
-                                 (money/wei->str :gwei
-                                                 fee-cap)
-                                 "-")
-               :tip-cap-gwei   (if tip-cap
-                                 (money/wei->str :gwei
-                                                 tip-cap)
-                                 "-")
-               :date           (datetime/timestamp->long-date timestamp)}
-              (if (= type :unsigned)
-                {:block     (i18n/label :t/not-applicable)
-                 :cost      (i18n/label :t/not-applicable)
-                 :gas-limit (i18n/label :t/not-applicable)
-                 :gas-used  (i18n/label :t/not-applicable)
-                 :nonce     (i18n/label :t/not-applicable)
-                 :hash      (i18n/label :t/not-applicable)}
-                {:cost (when gas-used
-                         (money/wei->str :eth
-                                         (money/fee-value gas-used gas-price)
-                                         native-currency-text))
-                 :url  (transactions/get-transaction-details-url
-                        chain-id
-                        (:hash transaction))}))))))
-
-(re-frame/reg-sub
- :wallet-legacy.transactions.details/screen
- (fn [[_ tx-hash address] _]
-   [(re-frame/subscribe [:wallet-legacy.transactions.details/current-transaction tx-hash address])
-    (re-frame/subscribe [:ethereum/current-block])])
- (fn [[transaction current-block]]
-   (let [confirmations (wallet.db/get-confirmations transaction
-                                                    current-block)]
-     (assoc transaction
-            :confirmations confirmations
-            :confirmations-progress
-            (if (>= confirmations transactions/confirmations-count-threshold)
-              100
-              (* 100 (/ confirmations transactions/confirmations-count-threshold)))))))
-
-(re-frame/reg-sub
- :push-notifications/wallet-transactions
- :<- [:push-notifications/preferences]
- (fn [pref]
-   (first (filter #(notifications.wallet/preference= %
-                                                     {:service    "wallet"
-                                                      :event      "transaction"
-                                                      :identifier "all"})
-                  pref))))
@@ -1,295 +0,0 @@
-(ns legacy.status-im.subs.wallet.wallet
-  (:require
-    [clojure.string :as string]
-    [legacy.status-im.ethereum.tokens :as tokens]
-    [legacy.status-im.utils.currency :as currency]
-    [legacy.status-im.wallet.utils :as wallet.utils]
-    [re-frame.core :as re-frame]
-    [status-im.config :as config]
-    [utils.i18n :as i18n]
-    [utils.money :as money]))
-
-(re-frame/reg-sub
- :balance
- :<- [:wallet-legacy]
- (fn [wallet [_ address]]
-   (get-in wallet [:accounts address :balance])))
-
-(re-frame/reg-sub
- :balance-default
- :<- [:wallet-legacy]
- :<- [:profile/wallet-accounts]
- (fn [[wallet accounts]]
-   (get-in wallet [:accounts (:address (wallet.utils/get-default-account accounts)) :balance])))
-
-(re-frame/reg-sub
- :balances
- :<- [:wallet-legacy]
- :<- [:multiaccount/visible-accounts]
- (fn [[wallet accounts]]
-   (let [accounts (map :address accounts)]
-     (map :balance (vals (select-keys (:accounts wallet) accounts))))))
-
-(re-frame/reg-sub
- :empty-balances?
- :<- [:balances]
- (fn [balances]
-   (every?
-    (fn [balance]
-      (every?
-       (fn [^js asset]
-         (or (nil? asset) (.isZero asset)))
-       (vals balance)))
-    balances)))
-
-(re-frame/reg-sub
- :price
- :<- [:prices]
- (fn [prices [_ fsym tsym]]
-   (get-in prices [fsym tsym])))
-
-(re-frame/reg-sub
- :last-day
- :<- [:prices]
- (fn [prices [_ fsym tsym]]
-   (get-in prices [fsym tsym :last-day])))
-
-(re-frame/reg-sub
- :wallet-legacy/settings-currency
- :<- [:profile/profile]
- (fn [settings]
-   (or (get settings :currency) :usd)))
-
-(defn get-balance-total-value
-  [balance prices currency token->decimals]
-  (reduce-kv (fn [acc sym value]
-               (if-let [price (get-in prices [sym currency])]
-                 (+ acc
-                    (or (some-> (money/internal->formatted value sym (token->decimals sym))
-                                ^js (money/crypto->fiat price)
-                                .toNumber)
-                        0))
-                 acc))
-             0
-             balance))
-
-(re-frame/reg-sub
- :wallet-legacy/token->decimals
- :<- [:wallet-legacy/all-tokens]
- (fn [all-tokens]
-   (into {} (map #(vector (:symbol %) (:decimals %)) (vals all-tokens)))))
-
-(re-frame/reg-sub
- :portfolio-value
- :<- [:balances]
- :<- [:prices]
- :<- [:wallet-legacy/currency]
- :<- [:wallet-legacy/token->decimals]
- (fn [[balances prices currency token->decimals]]
-   (if (and balances prices)
-     (let [currency-key        (-> currency :code keyword)
-           balance-total-value (apply
-                                +
-                                (map #(get-balance-total-value % prices currency-key token->decimals)
-                                     balances))]
-       (if (pos? balance-total-value)
-         (-> balance-total-value
-             (money/with-precision 2)
-             str
-             (i18n/format-currency (:code currency)))
-         "0"))
-     "...")))
-
-(re-frame/reg-sub
- :account-portfolio-value
- (fn [[_ address] _]
-   [(re-frame/subscribe [:balance address])
-    (re-frame/subscribe [:prices])
-    (re-frame/subscribe [:wallet-legacy/currency])
-    (re-frame/subscribe [:wallet-legacy/token->decimals])])
- (fn [[balance prices currency token->decimals]]
-   (if (and balance prices)
-     (let [currency-key        (-> currency :code keyword)
-           balance-total-value (get-balance-total-value balance prices currency-key token->decimals)]
-       (if (pos? balance-total-value)
-         (-> balance-total-value
-             (money/with-precision 2)
-             str
-             (i18n/format-currency (:code currency)))
-         "0"))
-     "...")))
-
-(re-frame/reg-sub
- :wallet-legacy/sorted-tokens
- :<- [:wallet-legacy/all-tokens]
- (fn [all-tokens]
-   (tokens/sorted-tokens-for all-tokens)))
-
-(re-frame/reg-sub
- :wallet-legacy/grouped-chain-tokens
- :<- [:wallet-legacy/sorted-tokens]
- :<- [:wallet-legacy/visible-tokens-symbols]
- (fn [[all-tokens visible-tokens]]
-   (let [vt-set (set visible-tokens)]
-     (group-by :custom?
-               (map #(assoc % :checked? (boolean (get vt-set (keyword (:symbol %))))) all-tokens)))))
-
-(re-frame/reg-sub
- :wallet-legacy/fetching-tx-history?
- :<- [:wallet-legacy]
- (fn [wallet [_ address]]
-   (get-in wallet [:fetching address :history?])))
-
-(re-frame/reg-sub
- :wallet-legacy/fetching-recent-tx-history?
- :<- [:wallet-legacy]
- (fn [wallet [_ address]]
-   (get-in wallet [:fetching address :recent?])))
-
-(re-frame/reg-sub
- :wallet-legacy/tx-history-fetched?
- :<- [:wallet-legacy]
- (fn [wallet [_ address]]
-   (get-in wallet [:fetching address :all-fetched?])))
-
-(re-frame/reg-sub
- :wallet-legacy/chain-explorer-link
- (fn [db [_ address]]
-   (let [network (:networks/current-network db)
-         link    (get-in config/default-networks-by-id
-                         [network :chain-explorer-link])]
-     (when link
-       (str link address)))))
-
-(re-frame/reg-sub
- :wallet-legacy/error-message
- :<- [:wallet-legacy]
- (fn [wallet]
-   (or (get-in wallet [:errors :balance-update])
-       (get-in wallet [:errors :prices-update]))))
-
-(re-frame/reg-sub
- :wallet-legacy/visible-tokens-symbols
- :<- [:ethereum/chain-keyword]
- :<- [:profile/profile]
- (fn [[chain current-multiaccount]]
-   (get-in current-multiaccount [:wallet-legacy/visible-tokens chain])))
-
-(re-frame/reg-sub
- :wallet-legacy/visible-assets
- :<- [:current-network]
- :<- [:wallet-legacy/visible-tokens-symbols]
- :<- [:wallet-legacy/sorted-tokens]
- (fn [[network visible-tokens-symbols all-tokens-sorted]]
-   (conj (filter #(contains? visible-tokens-symbols (:symbol %)) all-tokens-sorted)
-         (tokens/native-currency network))))
-
-(re-frame/reg-sub
- :wallet-legacy/visible-assets-with-amount
- (fn [[_ address] _]
-   [(re-frame/subscribe [:balance address])
-    (re-frame/subscribe [:wallet-legacy/visible-assets])])
- (fn [[balance visible-assets]]
-   (map #(assoc % :amount (get balance (:symbol %))) visible-assets)))
-
-(defn update-value
-  [prices currency]
-  (fn [{:keys [decimals amount] :as token}]
-    (let [sym         (:symbol token)
-          currency-kw (-> currency :code keyword)
-          price       (get-in prices [sym currency-kw])]
-      (assoc token
-             :price price
-             :value (when (and amount price)
-                      (-> (money/internal->formatted amount sym decimals)
-                          (money/crypto->fiat price)
-                          (money/with-precision 2)
-                          str
-                          (i18n/format-currency (:code currency))))))))
-
-(re-frame/reg-sub
- :wallet-legacy/visible-assets-with-values
- (fn [[_ address] _]
-   [(re-frame/subscribe [:wallet-legacy/visible-assets-with-amount address])
-    (re-frame/subscribe [:prices])
-    (re-frame/subscribe [:wallet-legacy/currency])])
- (fn [[assets prices currency]]
-   (let [{:keys [tokens nfts]} (group-by #(if (:nft? %) :nfts :tokens) assets)
-         tokens-with-values    (map (update-value prices currency) tokens)]
-     {:tokens tokens-with-values
-      :nfts   nfts})))
-
-(defn get-asset-amount
-  [balances sym]
-  (reduce #(if-let [^js bl (get %2 sym)]
-             (.plus ^js (or ^js %1 ^js (money/bignumber 0)) bl)
-             %1)
-          nil
-          balances))
-
-(re-frame/reg-sub
- :wallet-legacy/all-visible-assets-with-amount
- :<- [:balances]
- :<- [:wallet-legacy/visible-assets]
- (fn [[balances visible-assets]]
-   (map #(assoc % :amount (get-asset-amount balances (:symbol %))) visible-assets)))
-
-(re-frame/reg-sub
- :wallet-legacy/all-visible-assets-with-values
- :<- [:wallet-legacy/all-visible-assets-with-amount]
- :<- [:prices]
- :<- [:wallet-legacy/currency]
- (fn [[assets prices currency]]
-   (let [{:keys [tokens nfts]} (group-by #(if (:nft? %) :nfts :tokens) assets)
-         tokens-with-values    (map (update-value prices currency) tokens)]
-     {:tokens tokens-with-values
-      :nfts   nfts})))
-
-(re-frame/reg-sub
- :wallet-legacy/transferrable-assets-with-amount
- (fn [[_ address]]
-   (re-frame/subscribe [:wallet-legacy/visible-assets-with-amount address]))
- (fn [all-assets]
-   (filter #(not (:nft? %)) all-assets)))
-
-(re-frame/reg-sub
- :wallet-legacy/currency
- :<- [:wallet-legacy/settings-currency]
- (fn [currency-id]
-   (get currency/currencies currency-id (get currency/currencies :usd))))
-
-(defn filter-recipient-favs
-  [search-filter {:keys [name]}]
-  (string/includes? (string/lower-case (str name)) search-filter))
-
-(re-frame/reg-sub
- :wallet-legacy/favourites-filtered
- :<- [:wallet-legacy/favourites]
- :<- [:wallet-legacy/search-recipient-filter]
- (fn [[favs search-filter]]
-   (let [favs (vals favs)]
-     (if (string/blank? search-filter)
-       favs
-       (filter (partial filter-recipient-favs
-                        (string/lower-case search-filter))
-               favs)))))
-
-(re-frame/reg-sub
- :wallet-legacy/collectible-collection
- :<- [:wallet-legacy/collectible-collections]
- (fn [all-collections [_ address]]
-   (when address
-     (let [all-collections (get all-collections (string/lower-case address) [])]
-       (sort-by :name all-collections)))))
-
-(re-frame/reg-sub
- :wallet-legacy/collectible-assets-by-collection-and-address
- :<- [:wallet-legacy/collectible-assets]
- (fn [all-assets [_ address collectible-slug]]
-   (get-in all-assets [address collectible-slug] [])))
-
-(re-frame/reg-sub
- :wallet-legacy/fetching-assets-by-collectible-slug
- :<- [:wallet-legacy/fetching-collection-assets]
- (fn [fetching-collection-assets [_ collectible-slug]]
-   (get fetching-collection-assets collectible-slug false)))
@@ -1,152 +0,0 @@
-(ns legacy.status-im.subs.wallet.wallet-test
-  (:require
-    [cljs.test :refer [deftest is testing]]
-    [legacy.status-im.subs.wallet.transactions :as wallet.transactions]
-    [legacy.status-im.subs.wallet.wallet :as wallet]
-    [re-frame.db :as rf-db]
-    [test-helpers.unit :as h]
-    [utils.money :as money]
-    [utils.re-frame :as rf]))
-
-(def money-zero (money/bignumber 0))
-(def money-eth (money/bignumber 8000000000000000000))
-(def money-snt (money/bignumber 756000000000000000000))
-(def main-account-id "0x0Fbd")
-
-(def accounts
-  [{:address "0x0Fbd"
-    :name    "Main account"
-    :hidden  false
-    :removed false}
-   {:address "0x5B03"
-    :name    "Secondary account"
-    :hidden  false
-    :removed false}])
-
-(def wallet
-  {:accounts {main-account-id
-              {:balance      {:ETH money-eth :SNT money-snt}
-               :transactions {}
-               :max-block    0}
-              "0x5B03"
-              {:balance      {:ETH money-eth :SNT money-snt}
-               :transactions {}
-               :max-block    10}}})
-
-(def prices
-  {:ETH {:USD 1282.23}
-   :SNT {:USD 0.0232}})
-
-(def tokens
-  {"0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-   {:address  "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-    :name     "Ether"
-    :symbol   :ETH
-    :decimals 18
-    :chainId  1}
-   "0x744d70fdbe2ba4cf95131626614a1763df805b9e"
-   {:address  "0x744d70fdbe2ba4cf95131626614a1763df805b9e"
-    :name     "Status Network Token"
-    :symbol   :SNT
-    :decimals 18
-    :chainId  1}})
-
-(h/deftest-sub :balances
-  [sub-name]
-  (swap! rf-db/app-db assoc
-    :profile/wallet-accounts accounts
-    :wallet-legacy           wallet)
-  (is (= [{:ETH money-eth
-           :SNT money-snt}
-          {:ETH money-eth
-           :SNT money-snt}]
-         (rf/sub [sub-name]))))
-
-(h/deftest-sub :wallet-legacy/token->decimals
-  [sub-name]
-  (swap! rf-db/app-db assoc :wallet-legacy/all-tokens tokens)
-  (is (= {:SNT 18 :ETH 18}
-         (rf/sub [sub-name]))))
-
-(deftest get-balance-total-value-test
-  (is (= 697.53
-         (wallet/get-balance-total-value
-          {:ETH (money/bignumber 1000000000000000000)
-           :SNT (money/bignumber 100000000000000000000)
-           :AST (money/bignumber 10000)}
-          {:ETH {:USD 677.91}
-           :SNT {:USD 0.1562}
-           :AST {:USD 4}}
-          :USD
-          {:ETH 18
-           :SNT 18
-           :AST 4}))))
-
-(h/deftest-sub :portfolio-value
-  [sub-name]
-  (testing "returns fallback value when balances and prices are not available"
-    (is (= "..." (rf/sub [sub-name]))))
-
-  (testing "returns zero when balance is not positive"
-    (let [empty-wallet {:accounts {main-account-id
-                                   {:balance {:ETH money-zero
-                                              :SNT money-zero}}}}]
-      (swap! rf-db/app-db assoc
-        :profile/wallet-accounts  accounts
-        :prices                   prices
-        :wallet-legacy            empty-wallet
-        :wallet-legacy/all-tokens tokens)
-      (is (= "0" (rf/sub [sub-name])))))
-
-  (testing "returns formatted value in the default USD currency"
-    (swap! rf-db/app-db assoc
-      :profile/wallet-accounts  accounts
-      :prices                   prices
-      :wallet-legacy            wallet
-      :wallet-legacy/all-tokens tokens)
-    (is (= "20,550.76" (rf/sub [sub-name])))))
-
-(h/deftest-sub :account-portfolio-value
-  [sub-name]
-  (testing "returns fallback value when balances and prices are not available"
-    (is (= "..." (rf/sub [sub-name]))))
-
-  (testing "returns zero when balance is not positive"
-    (let [empty-wallet {:accounts {main-account-id
-                                   {:balance {:ETH money-zero
-                                              :SNT money-zero}}}}]
-      (swap! rf-db/app-db assoc
-        :profile/wallet-accounts  accounts
-        :prices                   prices
-        :wallet-legacy            empty-wallet
-        :wallet-legacy/all-tokens tokens)
-      (is (= "0" (rf/sub [sub-name main-account-id])))))
-
-  (testing "returns formatted value in the default USD currency"
-    (swap! rf-db/app-db assoc
-      :profile/wallet-accounts  accounts
-      :prices                   prices
-      :wallet-legacy            wallet
-      :wallet-legacy/all-tokens tokens)
-    (is (= "10,275.38" (rf/sub [sub-name main-account-id])))))
-
-(def transactions
-  [{:timestamp "1505912551000"}
-   {:timestamp "1505764322000"}
-   {:timestamp "1505750000000"}])
-
-(def grouped-transactions
-  '({:title "20 Sep"
-     :key :20170920
-     :data
-     ({:timestamp "1505912551000"})}
-    {:title "18 Sep"
-     :key :20170918
-     :data
-     ({:timestamp "1505764322000"}
-      {:timestamp "1505750000000"})}))
-
-(deftest group-transactions-by-date
-  (testing "Check if transactions are sorted by date"
-    (is (= (wallet.transactions/group-transactions-by-date transactions)
-           grouped-transactions))))
@@ -1,13 +1,12 @@
 (ns legacy.status-im.ui.components.keyboard-avoid-presentation
  (:require
    [legacy.status-im.ui.components.react :as react]
+    [react-native.utils :as rn.utils]
    [reagent.core :as reagent]))

 (defn keyboard-avoiding-view
-  []
-  (let [this     (reagent/current-component)
-        props    (reagent/props this)
-        children (reagent/children this)]
+  [& argv]
+  (let [[props children] (rn.utils/get-props-and-children argv)]
    (reagent/as-element
     (into [react/keyboard-avoiding-view
            (update props
@@ -3,16 +3,16 @@
    [legacy.status-im.ui.components.spacing :as spacing]
    [legacy.status-im.ui.components.text :as text]
    [react-native.core :as rn]
-    [reagent.core :as reagent]))
+    [react-native.utils :as rn.utils]))

 (defn footer
-  []
-  (let [this (reagent/current-component)
+  [& argv]
+  (let [[props children] (rn.utils/get-props-and-children argv)
        {:keys [color]
         :or   {color :secondary}}
-        (reagent/props this)]
+        props]
    [rn/view
     {:style (merge (:base spacing/padding-horizontal)
                    (:small spacing/padding-vertical))}
     (into [text/text {:color color}]
-           (reagent/children this))]))
+           children)]))
@@ -3,18 +3,18 @@
    [legacy.status-im.ui.components.spacing :as spacing]
    [legacy.status-im.ui.components.text :as text]
    [react-native.core :as rn]
-    [reagent.core :as reagent]))
+    [react-native.utils :as rn.utils]))

 (defn header
-  []
-  (let [this (reagent/current-component)
+  [& argv]
+  (let [[props children] (rn.utils/get-props-and-children argv)
        {:keys [color]
         :or   {color :secondary}}
-        (reagent/props this)]
+        props]
    [rn/view
     {:style (merge (:base spacing/padding-horizontal)
                    (:x-tiny spacing/padding-vertical))}
     (into [text/text
            {:color color
             :style {:margin-top 10}}]
-           (reagent/children this))]))
+           children)]))
@@ -3,7 +3,7 @@
    [legacy.status-im.ui.components.colors :as colors]
    [legacy.status-im.ui.components.typography :as typography]
    [react-native.core :as rn]
-    [reagent.core :as reagent]))
+    [react-native.utils :as rn.utils]))

 (defn text-style
  [{:keys [size align weight monospace color style]}]
@@ -40,11 +40,9 @@
         style))

 (defn text
-  []
-  (let [this      (reagent/current-component)
-        props     (reagent/props this)
-        component rn/text]
-    (into [component
+  [& argv]
+  (let [[props children] (rn.utils/get-props-and-children argv)]
+    (into [rn/text
           (merge {:style (text-style props)}
                  (dissoc props
                   :style
@@ -53,4 +51,4 @@
                   :color
                   :align
                   :animated?))]
-          (reagent/children this))))
+          children)))
@@ -13,37 +13,21 @@
  (re-frame/dispatch event))

 (defn- normal-mode-settings-data
-  [{:keys [network-name
-           current-log-level
+  [{:keys [current-log-level
           light-client-enabled?
           transactions-management-enabled?
           current-fleet
           webview-debug
           test-networks-enabled?
-           is-sepolia-enabled?]}]
+           is-goerli-enabled?
+           peer-syncing-enabled?]}]
  (keep
   identity
   [{:size :small
-     :title (i18n/label :t/network)
-     :accessibility-label :network-button
-     :container-margin-top 8
-     :on-press
-     #(re-frame/dispatch [:navigate-to :network-settings])
-     :accessory :text
-     :accessory-text network-name
-     :chevron true}
-    {:size :small
-     :title (i18n/label :t/network-info)
-     :accessibility-label :network-button
-     :container-margin-top 8
-     :on-press
-     #(re-frame/dispatch [:navigate-to :network-info])
-     :chevron true}
-    {:size :small
     :title (i18n/label :t/log-level)
     :accessibility-label :log-level-settings-button
     :on-press
-     #(re-frame/dispatch [:navigate-to :log-level-settings])
+     #(re-frame/dispatch [:open-modal :log-level-settings])
     :accessory :text
     :accessory-text current-log-level
     :chevron true}
@@ -51,7 +35,7 @@
     :title (i18n/label :t/fleet)
     :accessibility-label :fleet-settings-button
     :on-press
-     #(re-frame/dispatch [:navigate-to :fleet-settings])
+     #(re-frame/dispatch [:open-modal :fleet-settings])
     :accessory :text
     :accessory-text current-fleet
     :chevron true}
@@ -66,14 +50,14 @@
     :accessibility-label :rpc-usage-info
     :container-margin-top 8
     :on-press
-     #(re-frame/dispatch [:navigate-to :rpc-usage-info])
+     #(re-frame/dispatch [:open-modal :rpc-usage-info])
     :chevron true}
    {:size :small
     :title (i18n/label :t/peers-stats)
     :accessibility-label :peers-stats
     :container-margin-top 8
     :on-press
-     #(re-frame/dispatch [:navigate-to :peers-stats])
+     #(re-frame/dispatch [:open-modal :peers-stats])
     :chevron true}
    {:size :small
     :title (i18n/label :t/light-client-enabled)
@@ -112,18 +96,26 @@
     :accessory :switch
     :active test-networks-enabled?}
    {:size :small
-     :title "Enable Sepolia as test network"
+     :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-sepolia-test-network])
+     #(re-frame/dispatch [:profile.settings/toggle-goerli-test-network])
     :accessory :switch
-     :active is-sepolia-enabled?}
+     :active is-goerli-enabled?}
+    {:size :small
+     :title "Peer syncing"
+     :accessibility-label :peer-syncing
+     :container-margin-bottom 8
+     :on-press
+     #(re-frame/dispatch [:profile.settings/toggle-peer-syncing])
+     :accessory :switch
+     :active peer-syncing-enabled?}
    {:size                :small
     :title               (i18n/label :t/set-currency)
     :accessibility-label :wallet-change-currency
     :on-press            #(hide-sheet-and-dispatch
-                            [:navigate-to :currency-settings])
+                            [:open-modal :currency-settings])
     :chevron             true}]))

 (defn- flat-list-data
@@ -139,23 +131,23 @@
 (views/defview advanced-settings
  []
  (views/letsubs [test-networks-enabled?           [:profile/test-networks-enabled?]
-                  is-sepolia-enabled?              [:profile/is-sepolia-enabled?]
+                  is-goerli-enabled?               [:profile/is-goerli-enabled?]
                  light-client-enabled?            [:profile/light-client-enabled?]
                  webview-debug                    [:profile/webview-debug]
-                  network-name                     [:network-name]
                  transactions-management-enabled? [:wallet-legacy/transactions-management-enabled?]
                  current-log-level                [:log-level/current-log-level]
-                  current-fleet                    [:fleets/current-fleet]]
+                  current-fleet                    [:fleets/current-fleet]
+                  peer-syncing-enabled?            [:profile/peer-syncing-enabled?]]
    [list/flat-list
     {:data      (flat-list-data
-                  {:network-name                     network-name
-                   :current-log-level                current-log-level
+                  {:current-log-level                current-log-level
                   :transactions-management-enabled? transactions-management-enabled?
                   :light-client-enabled?            light-client-enabled?
                   :current-fleet                    current-fleet
                   :dev-mode?                        false
                   :webview-debug                    webview-debug
                   :test-networks-enabled?           test-networks-enabled?
-                   :is-sepolia-enabled?              is-sepolia-enabled?})
+                   :is-goerli-enabled?               is-goerli-enabled?
+                   :peer-syncing-enabled?            peer-syncing-enabled?})
      :key-fn    (fn [_ i] (str i))
      :render-fn render-item}]))
@@ -11,7 +11,6 @@
    [legacy.status-im.ui.screens.browser.accounts :as accounts]
    [legacy.status-im.ui.screens.browser.empty-tab.styles :as styles]
    [legacy.status-im.ui.screens.browser.views :as browser]
-    [legacy.status-im.ui.screens.wallet.components.views :as components]
    [re-frame.core :as re-frame]
    [reagent.core :as reagent]
    [utils.i18n :as i18n]
@@ -144,7 +143,7 @@
         :container-style     styles/input-container-style
         :accessibility-label :dapp-url-input
         :return-key-type     :go}]
-       [components/separator-dark]
+       [react/view {:style {:height 1 :background-color (colors/alpha colors/black 0.1)}}]
       [list/flat-list
        {:header          [list-header (empty? bookmarks)]
         :data            bookmarks
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .25.0
 .28.0