wip

Data to screen was passed via rf-db and acquired in the screen via
sbuscription. But sometimes subscription wasnt calculated yet and
returned nil value. That nil value was captured by use-state and never
updated after subscription updated.

.env

@@ -36,5 +36,3 @@ SHOW_NOT_IMPLEMENTED_FEATURES=0
 ENABLE_ALERT_BANNER=0
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
-SENTRY_ENABLED=0
-SENTRY_ENVIRONMENT=ci-main

.env.e2e

@@ -40,5 +40,3 @@ ENABLE_ALERT_BANNER=0
 FLAG_WALLET_CONNECT_ENABLED=1
 MOBILE_DATA_SYNCING_TOGGLE_ENABLE=0
 API_LOGGING_ENABLED=1
-SENTRY_ENABLED=0
-SENTRY_ENVIRONMENT=ci-main

.env.jenkins

@@ -37,5 +37,3 @@ TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
-SENTRY_ENABLED=0
-SENTRY_ENVIRONMENT=ci-main

.env.nightly

@@ -24,5 +24,3 @@ TEST_NETWORKS_ENABLED=0
 ENABLE_ALERT_BANNER=1
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
-SENTRY_ENABLED=1
-SENTRY_ENVIRONMENT=ci-nightly

.env.release

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=error
+LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -21,5 +21,3 @@ TEST_NETWORKS_ENABLED=0
 STATUS_PROXY_STAGE_NAME=prod
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=0
-SENTRY_ENABLED=1
-SENTRY_ENVIRONMENT=production

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.18'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -41,7 +41,6 @@ pipeline {
     BUILD_ENV = 'prod'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1
-    SENTRY_PRODUCTION = "${utils.isReleaseBuild() ? 'true' : 'false'}"
   }
 
   stages {

ci/Jenkinsfile.combined

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.18'
 
 import groovy.json.JsonBuilder
 
@@ -134,3 +134,4 @@ def updateBucketJSON(urls, fileName) {
   writeFile(file: filePath, text: contentJson)
   return s5cmd.upload(filePath)
 }
+

ci/Jenkinsfile.e2e-nightly

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

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.18'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -41,7 +41,6 @@ pipeline {
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1
     BUNDLE_PATH = "${HOME}/.bundle"
-    SENTRY_PRODUCTION = "${utils.isReleaseBuild() ? 'true' : 'false'}"
   }
 
   stages {

ci/Jenkinsfile.tests

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

ci/tests/Jenkinsfile.e2e-nightly

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

ci/tests/Jenkinsfile.e2e-prs

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

ci/tests/Jenkinsfile.e2e-upgrade

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

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.nix-cache

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.20'
+library 'status-jenkins-lib@v1.9.13'
 
 pipeline {
   agent { label params.AGENT_LABEL }
@@ -109,19 +109,10 @@ pipeline {
     stage('Upload') {
       steps { script {
         sshagent(credentials: ['nix-cache-ssh']) {
-          nix.shell(
+          nix.shell("""
-            """
               find /nix/store/ -mindepth 1 -maxdepth 1 -type d \
-                -not -name "*.links" -and -not -name "*-status-mobile-*" \
+                -not -name '*.links' -and -not -name '*-status-mobile-*' \
-                -and -not -name "tmp-*" \
+                | xargs nix copy --to ${NIX_SSH_REMOTE}
-                -print0 | xargs -0 nix-store -qR | sort -u > "${WORKSPACE_TMP}"/store-paths.txt
-            """,
-            pure: false
-          )
-          nix.shell(
-            """
-              nix-store --export < "${WORKSPACE_TMP}"/store-paths.txt | \\
-                ssh ${env.NIX_SSHOPTS} ${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST} ${env.NIX_STORE_CMD} --import
             """,
             pure: false
           )

ci/tools/Jenkinsfile.playstore-meta

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

ci/tools/Jenkinsfile.xcode-clean

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

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

@@ -35,11 +35,6 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         return File(pubDirectory, gethLogFileName)
     }
 
-    private fun getPreLoginLogFile(): File {
-        val pubDirectory = utils.getPublicStorageDirectory()
-        return File(pubDirectory, preLoginLogFileName)
-    }
-
     fun prepareLogsFile(context: Context): File? {
         val logFile = getGethLogFile()
 
@@ -161,7 +156,6 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         val statusLogFile = File(logsTempDir, statusLogFileName)
         val gethLogFile = getGethLogFile()
         val requestLogFile = getRequestLogFile()
-        val preLoginLogFile = getPreLoginLogFile()
 
         try {
             if (zipFile.exists() || zipFile.createNewFile()) {
@@ -181,9 +175,6 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
             if (requestLogFile.exists()) {
                 filesToZip.add(requestLogFile)
             }
-            if (preLoginLogFile.exists()) {
-                filesToZip.add(preLoginLogFile)
-            }
             val zipped = zip(filesToZip.toTypedArray(), zipFile, errorList)
             if (zipped && zipFile.exists()) {
                 zipFile.setReadable(true, false)
@@ -214,7 +205,6 @@ class LogManager(private val reactContext: ReactApplicationContext) : ReactConte
         private const val gethLogFileName = "geth.log"
         private const val statusLogFileName = "Status.log"
         private const val requestsLogFileName = "api.log"
-        private const val preLoginLogFileName = "pre_login.log"
         private const val logsZipFileName = "Status-debug-logs.zip"
     }
 }

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

@@ -108,15 +108,6 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va
         )
     }
 
-    @ReactMethod
-    fun intendedPanic(message: String) {
-        StatusBackendClient.executeStatusGoRequest(
-            endpoint = "IntendedPanic",
-            requestBody = message,
-            statusgoFunction = { Statusgo.intendedPanic(message) },
-        )
-    }
-
     @ReactMethod
     fun addCentralizedMetric(request: String, callback: Callback) {
         StatusBackendClient.executeStatusGoRequestWithCallback(

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

@@ -35,7 +35,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
 
     NSURL *mainGethLogsFile = [rootUrl URLByAppendingPathComponent:@"geth.log"];
     NSURL *mainLogsFile = [logsFolderName URLByAppendingPathComponent:@"geth.log"];
-    NSURL *preLoginLogFile = [rootUrl URLByAppendingPathComponent:@"pre_login.log"];
 
     NSURL *requestsLogFile = [rootUrl URLByAppendingPathComponent:@"api.log"];
 
@@ -47,10 +46,6 @@ RCT_EXPORT_METHOD(sendLogs:(NSString *)dbJson
     if ([fileManager fileExistsAtPath:requestsLogFile.path]) {
         [fileManager copyItemAtPath:requestsLogFile.path toPath:[logsFolderName URLByAppendingPathComponent:@"api.log"].path error:nil];
     }
-    
-    if ([fileManager fileExistsAtPath:preLoginLogFile.path]) {
-        [fileManager copyItemAtPath:preLoginLogFile.path toPath:[logsFolderName URLByAppendingPathComponent:@"pre_login.log"].path error:nil];
-    }
 
     [SSZipArchive createZipFileAtPath:zipFile.path withContentsOfDirectory:logsFolderName.path];
     [fileManager removeItemAtPath:logsFolderName.path error:nil];

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

@@ -109,17 +109,6 @@ RCT_EXPORT_METHOD(getNodeConfig:(RCTResponseSenderBlock)callback) {
                                                callback:callback];
 }
 
-RCT_EXPORT_METHOD(intendedPanic:(NSString *)message) {
-#if DEBUG
-    NSLog(@"IntendedPanic() method called");
-#endif
-    [StatusBackendClient executeStatusGoRequest:@"IntendedPanic"
-                                           body:message
-                               statusgoFunction:^NSString *{
-        return StatusgoIntendedPanic(message);
-    }];
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(fleets) {
     return [StatusBackendClient executeStatusGoRequestWithResult:@"Fleets"
                                                          body:@""

nix/deps/gradle/deps_hack.sh

@@ -6,7 +6,6 @@ readonly FOOJAY_FALLBACK="0.5.0"
 readonly KOTLIN_FALLBACK="1.8.0"
 readonly TOOLS_FALLBACK="3.5.4"
 readonly HERMES_FALLBACK="0.73.5"
-readonly GRADLE_LINT_FALLBACK="31.1.1"
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 cd "${GIT_ROOT}"
@@ -26,28 +25,16 @@ get_version() {
     echo "$version"
 }
 
-# https://github.com/googlesamples/android-custom-lint-rules/blob/be672cd747ecf13844918e1afccadb935f856a72/docs/api-guide/example.md.html#L112-L129
-get_gradle_lint_version() {
-  gradlePluginVersion=$(get_version "./nix/pkgs/aapt2/default.nix" "version =" $GRADLE_LINT_FALLBACK)
-  major=$(echo "$gradlePluginVersion" | grep -o "^[0-9]*")
-  #  lintVersion = gradlePluginVersion + 23.0.0
-  major=$((major + 23))
-  minor=$(echo "$gradlePluginVersion" | grep -o "\.[0-9]*\." | grep -o "[0-9]*")
-  patch=$(echo "$gradlePluginVersion" | grep -o "[0-9]*$")
-
-  echo "$major.$minor.$patch"
-}
-
 foojay_version=$(get_version "./node_modules/@react-native/gradle-plugin/settings.gradle.kts" "foojay.*version" "$FOOJAY_FALLBACK")
 kotlin_version=$(get_version "./node_modules/@react-native/gradle-plugin/gradle/libs.versions.toml" "kotlin =" "$KOTLIN_FALLBACK")
 tools_version=$(get_version "./patches/BlurView-build.gradle.patch" "gradle:" "$TOOLS_FALLBACK")
 hermes_version=$(get_version "./node_modules/react-native/ReactAndroid/gradle.properties" "VERSION_NAME" "$HERMES_FALLBACK")
-lint_version=$(get_gradle_lint_version)
+
 
 cat << EOF
 org.gradle.toolchains.foojay-resolver-convention:org.gradle.toolchains.foojay-resolver-convention.gradle.plugin:$foojay_version
 org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$kotlin_version
 com.android.tools.build:gradle:$tools_version
 com.facebook.react:hermes-android:$hermes_version
-com.android.tools.lint:lint-gradle:$lint_version
+com.android.tools.lint:lint-gradle:31.1.1
 EOF

nix/mobile/android/build.nix

@@ -71,7 +71,7 @@ in stdenv.mkDerivation rec {
     };
   };
 
-  buildInputs = with pkgs; [ nodejs openjdk_headless ];
+  buildInputs = with pkgs; [ nodejs openjdk ];
   nativeBuildInputs = with pkgs; [ bash gradle unzip ]
     ++ lib.optionals stdenv.isDarwin [ file gnumake ];
 

nix/mobile/android/default.nix

@@ -8,7 +8,7 @@ rec {
 
   shell = mkShell {
     buildInputs = with pkgs; [
-      openjdk_headless
+      openjdk
       gradle
       lsof  # used in start-react-native.sh
       flock # used in nix/scripts/node_modules.sh

nix/mobile/jsbundle/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation {
           ];
         };
     };
-  buildInputs = with pkgs; [ clojure nodejs bash git openjdk_headless ];
+  buildInputs = with pkgs; [ clojure nodejs bash git openjdk];
   phases = [
     "unpackPhase" "secretsPhase" "patchPhase"
     "configurePhase" "buildPhase" "installPhase"

nix/overlay.nix

@@ -49,7 +49,7 @@ in {
   nodejs = super.nodejs_20;
   ruby = super.ruby_3_1;
   yarn = super.yarn.override { nodejs = super.nodejs_20; };
-  openjdk_headless = super.openjdk17_headless;
+  openjdk = super.openjdk17_headless;
   xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
     versions = ["16.0" "16.1" "16.2"];
   };

nix/pkgs/aapt2/default.nix

@@ -10,7 +10,6 @@ let
 
   pname = "aapt2";
   # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  # also referenced in nix/deps/gradle/deps_hack.sh
   version = "8.1.1-10154469";
 
   pkgPath = "com/android/tools/build/aapt2";

nix/pkgs/android-sdk/shell.nix

@@ -1,8 +1,8 @@
-{ mkShell, openjdk_headless, androidPkgs }:
+{ mkShell, openjdk, androidPkgs }:
 
 mkShell {
   name = "android-sdk-shell";
-  buildInputs = [ openjdk_headless ];
+  buildInputs = [ openjdk ];
 
   shellHook = ''
     export ANDROID_HOME="${androidPkgs.sdk}"

nix/shells.nix

@@ -19,7 +19,7 @@ let
     # for calling clojure targets in CI or Makefile
     clojure = mkShell {
       buildInputs = with pkgs; [
-        clojure flock maven openjdk_headless
+        clojure flock maven openjdk
         # lint specific utilities
         babashka clj-kondo clojure-lsp ripgrep zprint
       ];
@@ -61,7 +61,7 @@ let
 
     # for 'scripts/generate-keystore.sh'
     keytool = mkShell {
-      buildInputs = with pkgs; [ openjdk_headless apksigner ];
+      buildInputs = with pkgs; [ openjdk apksigner ];
     };
 
     # for targets needing 'adb', 'apkanalyzer' and other SDK/NDK tools

nix/status-go/mobile/build.nix

@@ -1,5 +1,5 @@
 { callPackage, lib, buildGoPackage, pkgs
-, androidPkgs, openjdk_headless, gomobile, xcodeWrapper, removeReferencesTo
+, androidPkgs, openjdk, gomobile, xcodeWrapper, removeReferencesTo
 , go-bindata, mockgen, protobuf3_20, protoc-gen-go
 , meta
 , source
@@ -32,7 +32,7 @@ in buildGoPackage rec {
   extraSrcPaths = [ gomobile ];
   nativeBuildInputs = [
     gomobile removeReferencesTo go-bindata mockgen protoc-gen-go protobuf3_20 fakeGit
-  ] ++ optional isAndroid openjdk_headless
+  ] ++ optional isAndroid openjdk
     ++ optional isIOS xcodeWrapper;
 
   ldflags = goBuildLdFlags;
@@ -48,10 +48,6 @@ in buildGoPackage rec {
   # TODO: try removing when go is upgraded to 1.22
   GODEBUG = "netdns=cgo+2";
 
-  # Sentry for status-go
-  SENTRY_CONTEXT_NAME = "status-mobile";
-  SENTRY_CONTEXT_VERSION = version;
-
   preBuild = ''
     echo 'Generate static files'
     pushd go/src/$goPackagePath

scripts/build-android.sh

@@ -45,9 +45,8 @@ SECRETS_ENV_VARS=(
     'INFURA_TOKEN_SECRET'
     'OPENSEA_API_KEY'
     'MIXPANEL_APP_ID'
-    'MIXPANEL_APP_TOKEN'
+    'MIXPANEL_TOKEN'
     'POKT_TOKEN'
-    'SENTRY_DSN_STATUS_GO'
 )
 
 # Secrets like this can't be passed via args or they end up in derivation.

shadow-cljs.edn

@@ -77,13 +77,8 @@
      #shadow/env "STATUS_BACKEND_SERVER_IMAGE_SERVER_URI_PREFIX"
      status-im.config/STATUS_BACKEND_SERVER_ROOT_DATA_DIR #shadow/env
                                                            "STATUS_BACKEND_SERVER_ROOT_DATA_DIR"
-
-     ;; Uncomment this line during development if you want to test the integration with Sentry.
-     ;;
-     ;; status-im.config/SENTRY_DSN_STATUS_GO #shadow/env "SENTRY_DSN_STATUS_GO"
-
      status-im.config/MIXPANEL_APP_ID #shadow/env "MIXPANEL_APP_ID"
-     status-im.config/MIXPANEL_APP_TOKEN #shadow/env "MIXPANEL_APP_TOKEN"
+     status-im.config/MIXPANEL_TOKEN #shadow/env "MIXPANEL_TOKEN"
      status-im.config/OPENSEA_API_KEY #shadow/env "OPENSEA_API_KEY"
      status-im.config/RARIBLE_MAINNET_API_KEY #shadow/env "RARIBLE_MAINNET_API_KEY"
      status-im.config/RARIBLE_TESTNET_API_KEY #shadow/env "RARIBLE_TESTNET_API_KEY"
@@ -124,10 +119,9 @@
      status-im.config/INFURA_TOKEN                        #shadow/env "INFURA_TOKEN"
      status-im.config/STATUS_BUILD_PROXY_USER             #shadow/env "STATUS_BUILD_PROXY_USER"
      status-im.config/STATUS_BUILD_PROXY_PASSWORD         #shadow/env "STATUS_BUILD_PROXY_PASSWORD"
-     status-im.config/SENTRY_DSN_STATUS_GO                #shadow/env "SENTRY_DSN_STATUS_GO"
      status-im.config/OPENSEA_API_KEY                     #shadow/env "OPENSEA_API_KEY"
      status-im.config/MIXPANEL_APP_ID                     #shadow/env "MIXPANEL_APP_ID"
-     status-im.config/MIXPANEL_APP_TOKEN                  #shadow/env "MIXPANEL_APP_TOKEN"
+     status-im.config/MIXPANEL_TOKEN                      #shadow/env "MIXPANEL_TOKEN"
      status-im.config/RARIBLE_MAINNET_API_KEY             #shadow/env "RARIBLE_MAINNET_API_KEY"
      status-im.config/RARIBLE_TESTNET_API_KEY             #shadow/env "RARIBLE_TESTNET_API_KEY"
      status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN      #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
@@ -174,7 +168,7 @@
     status-im.config/INFURA_TOKEN                   #shadow/env "INFURA_TOKEN"
     status-im.config/OPENSEA_API_KEY                #shadow/env "OPENSEA_API_KEY"
     status-im.config/MIXPANEL_APP_ID                #shadow/env "MIXPANEL_APP_ID"
-    status-im.config/MIXPANEL_APP_TOKEN             #shadow/env "MIXPANEL_APP_TOKEN"
+    status-im.config/MIXPANEL_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
     status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
     status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
     status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"

src/legacy/status_im/log_level/core.cljs

@@ -2,41 +2,19 @@
   (:require
     [legacy.status-im.multiaccounts.update.core :as multiaccounts.update]
     [re-frame.core :as re-frame]
-    [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
 (rf/defn save-log-level
   {:events [:log-level.ui/change-log-level-confirmed]}
-  [{:keys [db]} log-level]
+  [{:keys [db] :as cofx} log-level]
   (let [old-log-level (get-in db [:profile/profile :log-level])]
     (when (not= old-log-level log-level)
-      (let [need-set-log-enabled? (or (empty? old-log-level) (empty? log-level))
+      (multiaccounts.update/multiaccount-update
-            log-enabled?          (boolean (seq log-level))
+       cofx
-            rpc-calls             (cond-> []
+       :log-level
-                                    log-enabled?
+       log-level
-                                    (conj {:method   "wakuext_setLogLevel"
+       {:on-success #(re-frame/dispatch [:profile/logout])}))))
-                                           :params   [{:logLevel log-level}]
-                                           :on-error #(log/error "Failed to set log level" %)})
-
-                                    need-set-log-enabled?
-                                    (conj {:method   "wakuext_setLogEnabled"
-                                           :params   [log-enabled?]
-                                           :on-error #(log/error "Failed to set log enabled" %)}))]
-        {:fx [[:json-rpc/call
-               (conj (vec (map #(assoc % :on-success nil) (butlast rpc-calls)))
-                     (assoc (last rpc-calls)
-                            :on-success
-                            #(rf/dispatch [:log-level/update-multiaccount log-level])))]]}))))
-
-(rf/defn update-multiaccount
-  {:events [:log-level/update-multiaccount]}
-  [cofx log-level]
-  (multiaccounts.update/multiaccount-update
-   cofx
-   :log-level
-   log-level
-   {:on-success #(rf/dispatch [:profile/logout])}))
 
 (rf/defn show-change-log-level-confirmation
   {:events [:log-level.ui/log-level-selected]}

src/legacy/status_im/ui/screens/advanced_settings/views.cljs

@@ -1,13 +1,10 @@
 (ns legacy.status-im.ui.screens.advanced-settings.views
   (:require
-    [clojure.string :as string]
     [legacy.status-im.ui.components.core :as components]
     [legacy.status-im.ui.components.list.item :as list.item]
     [legacy.status-im.ui.components.list.views :as list]
     [quo.core :as quo]
     [re-frame.core :as re-frame]
-    [status-im.config :as config]
-    [status-im.feature-flags :as ff]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf])
   (:require-macros [legacy.status-im.utils.views :as views]))
@@ -20,16 +17,7 @@
            peer-syncing-enabled?]}]
   (keep
    identity
-   [(when (ff/enabled? ::ff/app-monitoring.intentional-crash)
+   [{:size :small
-      {:size                :small
-       :title               (str "Force crash immediately"
-                                 (when (string/blank? config/sentry-dsn-status-go)
-                                   " (Sentry DSN is not set)"))
-       :accessibility-label :intended-panic
-       :on-press            (fn []
-                              (re-frame/dispatch [:app-monitoring/intended-panic
-                                                  "status-mobile intentional panic"]))})
-    {:size :small
      :title (i18n/label :t/log-level)
      :accessibility-label :log-level-settings-button
      :on-press

src/legacy/status_im/ui/screens/log_level_settings/views.cljs

@@ -33,9 +33,6 @@
         name]]]]))
 
 (def log-levels
-  "The status-go log library (zap) doesn't support the trace level, so we remove
-  the trace option from the UI. When trace is enabled an error will happen while
-  trying to login (user will see the error 'wrong password')."
   [{:name  "DISABLED"
     :value ""}
    {:name  "ERROR"
@@ -45,7 +42,9 @@
    {:name  "INFO"
     :value "INFO"}
    {:name  "DEBUG"
-    :value "DEBUG"}])
+    :value "DEBUG"}
+   {:name  "TRACE"
+    :value "TRACE"}])
 
 (views/defview log-level-settings
   []

src/native_module/core.cljs

@@ -569,7 +569,3 @@
    (.createAccountFromPrivateKey ^js (account-manager)
                                  (types/clj->json {:privateKey private-key})
                                  callback)))
-
-(defn intended-panic
-  [message]
-  (.intendedPanic ^js (status) message))

src/quo/components/community/community_card_view.cljs

@@ -55,7 +55,7 @@
         [rn/view (style/card-view-chat-icon 48 theme)
          [icon/community-icon {:images images} 48]]
         (when (= status :gated)
-          [rn/view style/permission-tag-styles
+          [rn/view (style/permission-tag-styles)
            [community-view/permission-tag-container
             {:locked? locked?
              :status  status
@@ -63,12 +63,10 @@
         [community-view/community-title
          {:title       name
           :description description}]
-        [rn/view {:style style/card-stats-position}
+        [rn/view {:style (style/card-stats-position)}
          [community-view/community-stats-column
-          {:type                 :card-view
+          {:type :card-view}]]
-           :members-count        (:members-count community)
+        [rn/view {:style (style/community-tags-position)}
-           :active-members-count (:active-members-count community)}]]
-        [rn/view {:style style/community-tags-position}
          [community-view/community-tags {:tags tags}]]]]]]))
 
 (defn view

src/quo/components/community/community_list_view.cljs

@@ -60,7 +60,7 @@
              :style          {:border-radius 12
                               :margin-left   12}}
             props)
-     [rn/view (merge style/membership-info-container style)
+     [rn/view (merge (style/membership-info-container) style)
       [community-icon/community-icon
        {:images images} 32]
       [rn/view

src/quo/components/community/community_view.cljs

@@ -11,8 +11,11 @@
     [react-native.gesture :as gesture]))
 
 (defn community-stats-column
-  [{:keys [type members-count active-members-count]}]
+  [{:keys [type members-count active-count]}]
-  [rn/view (if (= type :card-view) style/card-stats-container style/list-stats-container)
+  [rn/view
+   (if (= type :card-view)
+     (style/card-stats-container)
+     (style/list-stats-container))
    [community-stat/view
     {:accessibility-label :stats-members-count
      :icon                :i/group
@@ -21,7 +24,7 @@
    [community-stat/view
     {:accessibility-label :stats-active-count
      :icon                :i/active-members
-     :value               active-members-count}]])
+     :value               active-count}]])
 
 (defn community-tags
   [{:keys [tags container-style last-item-style]}]

src/quo/components/community/style.cljs

@@ -17,20 +17,24 @@
 (def detail-container
   {:flex 1})
 
-(def card-stats-container
+(defn card-stats-container
+  []
   {:flex-direction :row})
 
-(def list-stats-container
+(defn list-stats-container
+  []
   {:flex-direction :row
    :align-items    :center})
 
-(def card-stats-position
+(defn card-stats-position
+  []
   {:position :absolute
    :top      116
    :right    12
    :left     12})
 
-(def community-tags-position
+(defn community-tags-position
+  []
   {:position :absolute
    :top      154
    :right    12
@@ -64,7 +68,8 @@
                       colors/neutral-90
                       theme)})
 
-(def membership-info-container
+(defn membership-info-container
+  []
   {:flex-direction :row
    :border-radius  16
    :align-items    :center
@@ -82,7 +87,8 @@
    :border-top-left-radius  20
    :background-color        colors/primary-50-opa-20})
 
-(def permission-tag-styles
+(defn permission-tag-styles
+  []
   {:position :absolute
    :top      8
    :right    8})
@@ -140,14 +146,10 @@
    :background-color   (colors/theme-colors colors/white colors/neutral-90 theme)})
 
 (def loading-tags-container
-  {:margin-top     20
+  {:margin-top 20 :flex-direction :row :align-items :center})
-   :flex-direction :row
-   :align-items    :center})
 
 (def loading-stats-container
-  {:margin-top     20
+  {:margin-top 20 :flex-direction :row :align-items :center})
-   :flex-direction :row
-   :align-items    :center})
 
 (defn loading-stat-circle
   [theme margin-left]

src/quo/components/wallet/summary_info/component_spec.cljs

@@ -14,43 +14,48 @@
 (h/describe "Wallet: Summary Info"
   (h/test "Type of `status-account` title renders"
     (h/render-with-theme-provider [summary-info/view
-                                   {:type             :status-account
+                                   {:type          :status-account
-                                    :networks-to-show {:ethereum 150
+                                    :networks?     true
-                                                       :optimism 50
+                                    :values        {:ethereum 150
-                                                       :arbitrum 25}
+                                                    :optimism 50
-                                    :account-props    status-account-props}])
+                                                    :arbitrum 25}
+                                    :account-props status-account-props}])
     (h/is-truthy (h/get-by-text "Collectibles vault")))
 
   (h/test "Type of `user` title renders"
     (h/render-with-theme-provider [summary-info/view
-                                   {:type             :user
+                                   {:type          :user
-                                    :networks-to-show {:ethereum 150
+                                    :networks?     true
-                                                       :optimism 50
+                                    :values        {:ethereum 150
-                                                       :arbitrum 25}
+                                                    :optimism 50
-                                    :account-props    {:full-name           "M L"
+                                                    :arbitrum 25}
-                                                       :status-indicator?   false
+                                    :account-props {:full-name           "M L"
-                                                       :size                :small
+                                                    :status-indicator?   false
-                                                       :customization-color :blue
+                                                    :size                :small
-                                                       :name                "Mark Libot"
+                                                    :customization-color :blue
-                                                       :address             "0x0ah...78b"
+                                                    :name                "Mark Libot"
-                                                       :status-account      (merge status-account-props
+                                                    :address             "0x0ah...78b"
-                                                                                   {:size 16})}}])
+                                                    :status-account      (merge status-account-props
+                                                                                {:size 16})}}])
     (h/is-truthy (h/get-by-text "Mark Libot"))
     (h/is-truthy (h/get-by-text "Collectibles vault")))
 
-  (h/test "Networks specified render"
+  (h/test "Networks true render"
     (h/render-with-theme-provider [summary-info/view
-                                   {:type             :status-account
+                                   {:type          :status-account
-                                    :networks-to-show {:ethereum 150
+                                    :networks?     true
-                                                       :optimism 50
+                                    :values        {:ethereum 150
-                                                       :arbitrum 25}
+                                                    :optimism 50
-                                    :account-props    status-account-props}])
+                                                    :arbitrum 25}
-    (h/is-truthy (h/get-by-label-text :networks))))
+                                    :account-props status-account-props}])
+    (h/is-truthy (h/get-by-label-text :networks)))
 
-(h/describe "Wallet: network summary info"
+  (h/test "Networks false render"
-  (h/test "Type of `network` title renders"
     (h/render-with-theme-provider [summary-info/view
-                                   {:type          :network
+                                   {:type          :status-account
-                                    :network-props {:full-name    "Ethereum"
+                                    :networks?     false
-                                                    :network-name :ethereum}}])
+                                    :values        {:ethereum 150
-    (h/is-truthy (h/get-by-text "Ethereum"))))
+                                                    :optimism 50
+                                                    :arbitrum 25}
+                                    :account-props status-account-props}])
+    (h/is-null (h/query-by-label-text :networks))))

src/quo/components/wallet/summary_info/schema.cljs

@@ -5,9 +5,9 @@
    [:catn
     [:props
      [:map
-      [:type [:enum :status-account :saved-account :account :user :token :network]]
+      [:type [:enum :status-account :saved-account :account :user :token]]
       [:account-props {:optional true} [:maybe :map]]
-      [:network-props {:optional true} [:maybe :map]]
       [:token-props {:optional true} [:maybe :map]]
-      [:networks-to-show {:optional true} [:maybe :map]]]]]
+      [:networks? {:optional true} [:maybe :boolean]]
+      [:values {:optional true} [:maybe :map]]]]]
    :any])

src/quo/components/wallet/summary_info/style.cljs

@@ -3,13 +3,13 @@
     [quo.foundations.colors :as colors]))
 
 (defn container
-  [networks-to-show? theme]
+  [networks? theme]
   {:width         "100%"
-   :height        (if networks-to-show? 90 56)
+   :height        (if networks? 90 56)
    :border-radius 16
    :border-width  1
    :border-color  (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)
-   :margin-bottom (if networks-to-show? 4 8)})
+   :margin-bottom (if networks? 4 8)})
 
 (def info-container
   {:flex-direction     :row
@@ -39,7 +39,3 @@
    :height             32
    :flex-direction     :row
    :align-items        :center})
-
-(def network-icon
-  {:width  32
-   :height 32})

src/quo/components/wallet/summary_info/view.cljs

@@ -28,35 +28,50 @@
      [rn/view
       {:style (style/dot-divider theme)}])])
 
-(def ^:private default-token-symbols
-  {:ethereum "ETH"
-   :optimism "OP"
-   :arbitrum "ARB"
-   :base     "ETH"})
-
 (defn networks
-  [networks-to-show theme]
+  [values theme]
-  (->> networks-to-show
+  (let [{:keys [ethereum optimism arbitrum base]} values
-       (map-indexed
+        show-optimism?                            (and optimism
-        (fn [i [k {:keys [amount token-symbol]}]]
+                                                       (or (pos? (:amount optimism))
-          (when (or (pos? amount)
+                                                           (= (:amount optimism) "<0.01")))
-                    (= amount "<0.01"))
+        show-arbitrum?                            (and arbitrum
-            [network-amount
+                                                       (or (pos? (:amount arbitrum))
-             {:network  k
+                                                           (= (:amount arbitrum) "<0.01")))
-              :amount   (str amount " " (or token-symbol (get default-token-symbols k)))
+        show-base?                                (and base
-              :divider? (not= (dec i) (-> networks-to-show keys count))
+                                                       (or (pos? (:amount base))
-              :theme    theme}])))
+                                                           (= (:amount base) "<0.01")))]
-       (remove nil?)
+    [rn/view
-       (into [rn/view
+     {:style               style/networks-container
-              {:style               style/networks-container
+      :accessibility-label :networks}
-               :accessibility-label :networks}])))
+     (when (and ethereum (pos? (:amount ethereum)))
+       [network-amount
+        {:network  :ethereum
+         :amount   (str (:amount ethereum) " " (or (:token-symbol ethereum) "ETH"))
+         :divider? (or show-arbitrum? show-optimism?)
+         :theme    theme}])
+     (when show-optimism?
+       [network-amount
+        {:network  :optimism
+         :amount   (str (:amount optimism) " " (or (:token-symbol optimism) "OETH"))
+         :divider? show-arbitrum?
+         :theme    theme}])
+     (when show-arbitrum?
+       [network-amount
+        {:network :arbitrum
+         :amount  (str (:amount arbitrum) " " (or (:token-symbol arbitrum) "ARB"))
+         :theme   theme}])
+     (when show-base?
+       [network-amount
+        {:network :base
+         :amount  (str (:amount base) " " (or (:token-symbol base) "ETH"))
+         :theme   theme}])]))
 
 (defn- view-internal
-  [{:keys [type account-props network-props token-props networks-to-show]}]
+  [{:keys [type account-props token-props networks? values]}]
   (let [theme   (quo.theme/use-theme)
         address (or (:address account-props) (:address token-props))]
     [rn/view
-     {:style (style/container (seq? networks-to-show) theme)}
+     {:style (style/container networks? theme)}
      [rn/view
       {:style style/info-container}
       (case type
@@ -67,26 +82,16 @@
                          (assoc account-props
                                 :size     :size-32
                                 :neutral? true)]
-        :network        [rn/image
-                         {:source (resources/get-network (:network-name network-props))
-                          :style  style/network-icon}]
         [user-avatar/user-avatar account-props])
       [rn/view {:style {:margin-left 8}}
-       (when (not (some #{type} [:account :network]))
+       (when (not= type :account)
-         [text/text
+         [text/text {:weight :semi-bold} (or (:name account-props) (:label token-props))])
-          {:weight :semi-bold}
-          (or (:name account-props) (:label token-props))])
-       (when (= type :network)
-         [text/text
-          {:weight :semi-bold}
-          (:full-name network-props)])
        [rn/view
         {:style {:flex-direction :row
                  :align-items    :center}}
         (when (= type :user)
           [:<>
-           [rn/view {:style {:margin-right 4}}
+           [rn/view {:style {:margin-right 4}} [account-avatar/view (:status-account account-props)]]
-            [account-avatar/view (:status-account account-props)]]
            [text/text
             {:size  :paragraph-2
              :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
@@ -100,10 +105,10 @@
             :style  {:color (when (not= type :account)
                               (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}}
            address])]]]
-     (when networks-to-show
+     (when networks?
        [:<>
         [rn/view
          {:style (style/line-divider theme)}]
-        [networks networks-to-show theme]])]))
+        [networks values theme]])]))
 
 (def view (schema/instrument #'view-internal summary-info-schema/?schema))

src/status_im/app/events.cljs

@@ -0,0 +1,129 @@
+(ns status-im.app.events
+  (:require
+    [status-im.app.use-case :as uc]
+    [taoensso.timbre :as log]
+    [utils.re-frame :as rf]))
+
+
+(def navigation-effects-tree
+  {:uc-view-saved-addresses
+   {:on-start             [[:dispatch [:open-modal :screen/settings.saved-addresses]]]
+    :uc-add-saved-address {:on-start  [[:dispatch [:open-modal :screen/settings.add-address-to-save]]]
+                           :on-finish [[:dispatch [:navigate-back]]]}
+    :on-finish            [[:dispatch [:navigate-back]]]}})
+
+
+(def db-path-use-case-stack [:app :use-cases-stack])
+
+(defn use-cases
+  [db]
+  (get-in db db-path-use-case-stack '()))
+
+(defn current-use-case
+  [db]
+  (-> db
+      use-cases
+      first))
+
+(defn- navigation-effects-for-key
+  [db last-key]
+  (let [path (-> db
+                 use-cases
+                 reverse
+                 vec
+                 (conj last-key))]
+    (tap> {:in        :navigation-effects-for-key
+           :use-cases (use-cases db)})
+    (get-in navigation-effects-tree path)))
+
+(defn start-use-case-navigation-effects
+  [db]
+  (navigation-effects-for-key db :on-start))
+
+(defn finish-use-case-navigation-effects
+  [db]
+  (navigation-effects-for-key db :on-finish))
+
+
+(rf/reg-event-fx :app/start-use-case
+ (fn [{:keys [db]} [use-case-id]]
+   (let [new-db (update-in db db-path-use-case-stack conj use-case-id)]
+     #_(tap> {:in      :app/start-use-case
+              :effects (start-use-case-navigation-effects new-db)})
+     {:db new-db
+      :fx (start-use-case-navigation-effects new-db)})))
+
+(rf/reg-event-fx :app/finish-use-case
+ (fn [{:keys [db]} [use-case-to-finish]]
+   (let [new-db (update-in db db-path-use-case-stack rest)]
+     (if (= (current-use-case db) use-case-to-finish)
+       {:db new-db
+        :fx (finish-use-case-navigation-effects db)}
+       ;; TODO: kozieiev: replace with effect
+       (log/error "Attempt to finish use case that is not current:" use-case-to-finish)))))
+
+(rf/reg-event-fx :app/clear-use-cases-stack
+ (fn [{:keys [db]}]
+   {:db (assoc-in db db-path-use-case-stack '())}))
+
+(comment
+  (rf/dispatch [:app/start-use-case :uc-save-address])
+  (rf/dispatch [:app/start-use-case :uc-edit-address])
+  (rf/dispatch [:app/finish-use-case :uc-edit-address])
+  (rf/dispatch [:app/finish-use-case :uc-save-address])
+
+
+  (rf/dispatch [:app/clear-use-cases-stack])
+
+  (rf/sub [:app/use-case-active? :uc-edit-address])
+  (rf/sub [:app/use-case-active? :uc-save-address])
+  (rf/sub [:app/current-use-case])
+  (rf/dispatch [:navigate-back])
+
+  (start-use-case-navigation-effects {:app {:use-cases-stack
+                                            '(:uc-view-saved-addresses :uc-add-saved-address)}})
+  (finish-use-case-navigation-effects {:app {:use-cases-stack
+                                             '(:uc-view-saved-addresses :uc-add-saved-address)}})
+
+  (use-cases {:app {:use-cases-stack
+                    '(:uc-view-saved-addresses :uc-add-saved-address)}})
+
+  (-> {:app {:use-cases-stack '(:uc-view-saved-addresses :uc-add-saved-address)}}
+      use-cases
+      reverse
+      vec
+      (conj :on-exit))
+
+
+)
+
+#_(rf/reg-event-fx
+   :app/notify-user
+   (fn [{:keys [db]} [{:keys [text type] :as message}]]
+     (let [notification-id (-> db
+                               (get-in [:app :last-user-notification :id] 0)
+                               inc)]
+       {;; whenever we need to publish notification we override the old and increment id
+        :db (assoc-in db
+             [:app :last-user-notification]
+             (merge message
+                    {:id notification-id}))
+        ;; TODO: toasts are part of ui layer and they shouldn't be published here. Instead some part
+        ;; of ui should keep track of last user notification and generate toast
+        :fx [#_[:dispatch
+                [:toasts/upsert
+                 {:type type
+                  :text text}]]]})))
+
+#_(comment
+    (rf/dispatch [:app/notify-user
+                  {:type :positive
+                   :text "This is a good news"}])
+    (rf/dispatch [:app/notify-user
+                  {:type :negative
+                   :text "This is a bad news"}])
+
+    (rf/dispatch [:toasts/upsert
+                  {:type :positive
+                   :text "This is a test notification3"}])
+  )

src/status_im/app/use_case.cljs

@@ -0,0 +1,97 @@
+(ns status-im.app.use-case)
+
+(defmulti initial-state
+  (fn [use-case-id]
+    use-case-id))
+
+(defmethod initial-state :default
+  [_]
+  {:use-case-id :default})
+
+(defn start
+  [use-case-id state-update]
+  (merge (initial-state use-case-id)
+         state-update))
+
+(defn make-step
+  [current-state state-update]
+  (merge current-state state-update))
+
+(defn finish
+  [use-case-id state-update]
+  (merge (initial-state use-case-id)
+         state-update))
+
+
+;; -----------------------------------------------------
+
+(defmethod initial-state :uc-view-saved-addresses
+  [_]
+  {:use-case-id :uc-view-saved-addresses})
+
+(defmethod initial-state :uc-add-saved-address
+  [_]
+  {:use-case-id         :uc-add-saved-address
+   :address             nil
+   :ens                 nil
+   :ens?                false
+   :name                nil
+   :customization-color nil})
+
+;; -----------------------------------------------------
+
+(defmulti navigation-start
+  (fn [use-case-data]
+    (:use-case-id use-case-data)))
+
+(defmulti navigation-step
+  (fn [use-case-data]
+    (:use-case-id use-case-data)))
+
+(defmethod navigation-step :default
+  []
+  nil)
+
+(defmulti navigation-finish
+  (fn [use-case-data]
+    (:use-case-id use-case-data)))
+
+;; -----------------------------------------------------
+
+(defmethod navigation-start :uc-view-saved-addresses
+  [_]
+  [[:dispatch [:open-modal :screen/settings.saved-addresses]]])
+
+(defmethod navigation-finish :uc-view-saved-addresses
+  [_]
+  [[:dispatch [:navigate-back]]])
+
+;; -----------------------------------------------------
+
+(defmethod navigation-start :uc-add-saved-address
+  [_]
+  [[:dispatch [:open-modal :screen/settings.add-address-to-save]]])
+
+(defmethod navigation-step :uc-add-saved-address
+  [{:keys [address ens ens?] :as use-case-state}]
+  [[:dispatch [:open-modal :screen/settings.add-address-to-save]]])
+
+(defmethod navigation-finish :uc-add-saved-address
+  [_]
+  [[:dispatch [:navigate-back]]])
+
+;; -----------------------------------------------------
+(comment
+  (initial-state :uc-add-saved-address)
+  (initial-state :uc-view-saved-addresses)
+  (initial-state :unknown)
+
+  (navigation-start {:use-case-id :uc-add-saved-address})
+  (navigation-finish {:use-case-id :uc-add-saved-address})
+  (navigation-start {:use-case-id :uc-add-saved-address})
+
+  (-> :uc-add-saved-address
+      initial-state
+      (make-step {:address "0xasdfas"})))
+
+

src/status_im/common/app_monitoring/effects.cljs

@@ -1,8 +0,0 @@
-(ns status-im.common.app-monitoring.effects
-  (:require
-    [native-module.core :as native-module]
-    [utils.re-frame :as rf]))
-
-(rf/reg-fx :effects.app-monitoring/intended-panic
- (fn [message]
-   (native-module/intended-panic message)))

src/status_im/common/app_monitoring/events.cljs

@@ -1,8 +0,0 @@
-(ns status-im.common.app-monitoring.events
-  (:require
-    status-im.common.app-monitoring.effects
-    [utils.re-frame :as rf]))
-
-(rf/reg-event-fx :app-monitoring/intended-panic
- (fn [_ [message]]
-   {:fx [[:effects.app-monitoring/intended-panic message]]}))

src/status_im/common/resources.cljs

@@ -26,19 +26,9 @@
    :qr-code                       (js/require "../resources/images/ui2/qr-code.png")
    :keycard-logo                  (js/require "../resources/images/ui2/keycard-logo.png")
    :keycard-buy                   (js/require "../resources/images/ui2/keycard-buy.png")
-   :keycard-backup-positive       (js/require "../resources/images/ui2/keycard-backup-positive.png")
-   :keycard-change-pin            (js/require "../resources/images/ui2/keycard-change-pin.png")
-   :keycard-change-pin-positive   (js/require "../resources/images/ui2/keycard-change-pin-positive.png")
-   :keycard-change-pin-negative   (js/require "../resources/images/ui2/keycard-change-pin-negative.png")
    :keycard-migration             (js/require "../resources/images/ui2/keycard-migration.png")
    :keycard-migration-failed      (js/require "../resources/images/ui2/keycard-migration-failed.png")
    :keycard-migration-succeeded   (js/require "../resources/images/ui2/keycard-migration-succeeded.png")
-   :keycard-not-same              (js/require "../resources/images/ui2/keycard-not-same.png")
-   :keycard-not-empty             (js/require "../resources/images/ui2/keycard-not-empty.png")
-   :keycard-reset-positive        (js/require "../resources/images/ui2/keycard-reset-positive.png")
-   :keycard-reset-negative        (js/require "../resources/images/ui2/keycard-reset-negative.png")
-   :keycard-unblock               (js/require "../resources/images/ui2/keycard-unblock.png")
-   :keycard-unblock-positive      (js/require "../resources/images/ui2/keycard-unblock-positive.png")
    :not-keycard                   (js/require "../resources/images/ui2/not-keycard.png")
    :discover                      (js/require "../resources/images/ui2/discover.png")
    :invite-friends                (js/require "../resources/images/ui2/invite-friends.png")

src/status_im/common/toasts/style.cljs

@@ -3,12 +3,13 @@
 
 (defn outmost-transparent-container
   []
-  {:elevation       2
+  {:elevation        2
-   :pointer-events  :box-none
+   :pointer-events   :box-none
-   :padding-top     (+ (safe-area/get-top) 6)
+   :padding-top      (+ (safe-area/get-top) 6)
-   :flex-direction  :column
+   :flex-direction   :column
-   :justify-content :center
+   :justify-content  :center
-   :align-items     :center})
+   :align-items      :center
+   :background-color :yellow})
 
 (def each-toast-container
   {:width         "100%"

src/status_im/config.cljs

@@ -26,11 +26,11 @@
 (goog-define ALCHEMY_BASE_MAINNET_TOKEN "")
 (goog-define ALCHEMY_BASE_SEPOLIA_TOKEN "")
 (goog-define WALLET_CONNECT_PROJECT_ID "87815d72a81d739d2a7ce15c2cfdefb3")
+(goog-define MIXPANEL_APP_ID "3350627")
+(goog-define MIXPANEL_TOKEN "5c73bda2d36a9f688a5ee45641fb6775")
 (goog-define STATUS_BUILD_ETH_RPC_PROXY_USER "")
 (goog-define STATUS_BUILD_ETH_RPC_PROXY_PASSWORD "")
 (goog-define STATUS_BUILD_ETH_RPC_PROXY_URL "")
-(goog-define MIXPANEL_APP_ID "")
-(goog-define MIXPANEL_APP_TOKEN "")
 
 (def mainnet-rpc-url (str "https://eth-archival.rpc.grove.city/v1/" POKT_TOKEN))
 (def sepolia-rpc-url (str "https://sepolia-archival.rpc.grove.city/v1/" POKT_TOKEN))
@@ -53,16 +53,8 @@
 (def opensea-link "https://opensea.io")
 (def opensea-tesnet-link "https://testnets.opensea.io")
 
-;; These MixPanel values should be injected via the CI since they vary depending
-;; on the environment, as we want to keep production and test/development
-;; metrics separate.
-;;
-;; We primarily use two MixPanel projects: the production project is named
-;; `status-im`, and the test project is `test.status-im`.
-;;
-;; During development, do not use the production app ID and token.
 (def mixpanel-app-id MIXPANEL_APP_ID)
-(def mixpanel-token MIXPANEL_APP_TOKEN)
+(def mixpanel-token MIXPANEL_TOKEN)
 
 (def opensea-api-key OPENSEA_API_KEY)
 (def status-proxy-enabled? true)
@@ -144,8 +136,3 @@
 
 (def re-frisk-host (get-config :RE_FRISK_HOST "localhost"))
 (def re-frisk-port (get-config :RE_FRISK_PORT "4567"))
-;;;; Sentry
-;; Documentation: status-go/internal/sentry/README.md
-(goog-define SENTRY_DSN_STATUS_GO "")
-(def sentry-enabled? (enabled? (get-config :SENTRY_ENABLED "0")))
-(def sentry-dsn-status-go SENTRY_DSN_STATUS_GO)

src/status_im/constants.cljs

@@ -443,10 +443,7 @@
 (def ^:const wallet-account-name-max-length 20)
 
 
-(def ^:const gas-rate-low 0)
 (def ^:const gas-rate-medium 1)
-(def ^:const gas-rate-high 2)
-(def ^:const gas-rate-custom 3)
 (def ^:const send-type-transfer 0)
 (def ^:const send-type-bridge 5)
 (def ^:const send-type-erc-721-transfer 6)

src/status_im/contexts/chat/events.cljs

@@ -275,8 +275,7 @@
   {:events [:chat/unmute-chat-community]}
   [{:keys [db]} chat-id]
   (let [{:keys [community-id]} (get-in db [:chats chat-id])]
-    (when community-id
+    {:db (assoc-in db [:communities community-id :muted] false)}))
-      {:db (assoc-in db [:communities community-id :muted] false)})))
 
 (rf/defn mute-chat-failed
   {:events [:chat/mute-failed]}

src/status_im/contexts/chat/messenger/messages/transport/events.cljs

@@ -21,7 +21,7 @@
     [status-im.contexts.chat.messenger.messages.pin.events :as messages.pin]
     [status-im.contexts.communities.events :as communities]
     [status-im.contexts.shell.activity-center.events :as activity-center]
-    [status-im.contexts.wallet.data-store :as wallet.data-store]
+    [status-im.infra.transform :as infra.transform]
     [taoensso.timbre :as log]
     [utils.re-frame :as rf]))
 
@@ -220,10 +220,10 @@
                    current-visibility-status-clj)))
 
       (seq saved-addresses-js)
-      (let [saved-addresses (-> saved-addresses-js types/js->clj wallet.data-store/rpc->saved-addresses)]
+      (let [saved-addresses (-> saved-addresses-js types/js->clj infra.transform/rpc->saved-addresses)]
         (js-delete response-js "savedAddresses")
         (rf/merge cofx
-                  {:fx [[:dispatch [:wallet/reconcile-saved-addresses saved-addresses]]]}
+                  {:fx [[:dispatch [:domain/reconcile-saved-addresses saved-addresses]]]}
                   (process-next response-js sync-handler)))
 
       (seq ens-username-details-js)

src/status_im/contexts/communities/actions/leave/events.cljs

@@ -18,9 +18,7 @@
       :params      [{:id request-to-join-id}]
       :on-success  #(rf/dispatch [:communities/cancel-request-to-join-success %])
       :js-response true
-      :on-error    #(log/error "failed to cancel request to join community"
+      :on-error    #(log/error "failed to cancel request to join community" request-to-join-id %)}]}))
-                               request-to-join-id
-                               %)}]}))
 
 (rf/reg-event-fx :communities/left
  (fn [_ [response-js]]

src/status_im/contexts/communities/discover/view.cljs

@@ -34,7 +34,8 @@
 
 (defn screen-title
   []
-  [rn/view {:style (style/screen-title-container (safe-area/get-top))}
+  [rn/view
+   {:style (style/screen-title-container (safe-area/get-top))}
    [quo/text
     {:accessibility-label :communities-screen-title
      :weight              :semi-bold
@@ -94,14 +95,14 @@
 
 (defn featured-list
   [communities view-type]
-  (let [view-size     (reagent/atom 0)
+  (let [view-size (reagent/atom 0)
-        set-view-size (fn [e]
+        loaded?   (and communities (pos? (count communities)))]
-                        (reset! view-size (- (oops/oget e "nativeEvent.layout.width") 40)))
-        loaded?       (and communities (pos? (count communities)))]
     (fn []
       [rn/view
        {:style     style/featured-list-container
-        :on-layout set-view-size}
+        :on-layout #(swap! view-size
+                      (fn [_]
+                        (- (oops/oget % "nativeEvent.layout.width") 40)))}
        (when-not (= @view-size 0)
          [rn/flat-list
           {:key-fn                            :id
@@ -131,29 +132,32 @@
    [discover-communities-segments selected-tab false]])
 
 (defn other-communities-list
-  [{:keys [communities view-type]}]
+  [{:keys [communities communities-ids view-type]}]
   [rn/view {:style style/other-communities-container}
-   (if (seq communities)
+   (if (and communities (pos? (count communities)))
-     (map-indexed (fn [inner-index {community-id :id :as community}]
+     (map-indexed
-                    (let [cover {:uri (-> community :images :banner :uri)}]
+      (fn [inner-index item]
-                      [rn/view
+        (let [community-id (when communities-ids item)
-                       {:key   (str inner-index community-id)
+              community    (if communities
-                        :style {:margin-bottom 16}}
+                             item
-                       (if (= view-type :card-view)
+                             (rf/sub [:communities/home-item community-id]))
-                         [quo/community-card-view-item
+              cover        {:uri (get-in (:images item) [:banner :uri])}]
-                          {:community (assoc community
+          [rn/view
-                                             :cover         cover
+           {:key           (str inner-index (:id community))
-                                             :members-count (count (:members community)))
+            :margin-bottom 16}
-                           :on-press  #(rf/dispatch [:communities/navigate-to-community-overview
+           (if (= view-type :card-view)
-                                                     community-id])}]
+             [quo/community-card-view-item
-                         [quo/community-list
+              {:community (assoc community :cover cover)
-                          {:on-press      (fn []
+               :on-press  #(rf/dispatch [:communities/navigate-to-community-overview (:id community)])}]
-                                            (rf/dispatch [:dismiss-keyboard])
+
-                                            (rf/dispatch [:communities/navigate-to-community-overview
+             [quo/community-list
-                                                          community-id]))
+              {:on-press      (fn []
-                           :on-long-press #(js/alert "TODO: to be implemented")}
+                                (rf/dispatch [:dismiss-keyboard])
-                          community])]))
+                                (rf/dispatch [:communities/navigate-to-community-overview
-                  communities)
+                                              (:id community)]))
+               :on-long-press #(js/alert "TODO: to be implemented")}
+              community])]))
+      (if communities communities communities-ids))
      [:<>
       [rn/view {:margin-bottom 16} [quo/community-card-view-item {:loading? true}]]
       [rn/view {:margin-bottom 16} [quo/community-card-view-item {:loading? true}]]
@@ -164,9 +168,8 @@
   [rn/view {:style {:flex 1}}
    (case @selected-tab
      :all
-     [other-communities-list
+     (other-communities-list {:communities (rf/sub [:communities/other-contract-communities])
-      {:communities (rf/sub [:communities/other-contract-communities])
+                              :view-type   view-type})
-       :view-type   view-type}]
 
      :open
      [:<>]
@@ -180,55 +183,60 @@
       (i18n/label :t/error)])])
 
 (defn render-communities
-  [{:keys [selected-tab featured-communities-count featured-communities view-type]}]
+  [selected-tab
-  [rn/view
+   featured-communities-count
-   [discover-communities-header
+   featured-communities
-    {:selected-tab               selected-tab
+   view-type]
-     :view-type                  view-type
+  (fn []
-     :featured-communities-count featured-communities-count
+    [rn/view
-     :featured-communities       featured-communities}]
+     [discover-communities-header
-   [communities-lists selected-tab view-type]])
+      {:selected-tab               selected-tab
+       :view-type                  view-type
+       :featured-communities-count featured-communities-count
+       :featured-communities       featured-communities}]
+     [communities-lists selected-tab view-type]]))
 
 (defn render-sticky-header
   [{:keys [selected-tab scroll-height]}]
-  (when (> @scroll-height 360)
+  (fn []
-    [rn/view
+    (when (> @scroll-height 360)
-     {:style (style/blur-tabs-header (safe-area/get-top))}
+      [rn/view
-     [discover-communities-segments selected-tab true]]))
+       {:style (style/blur-tabs-header (safe-area/get-top))}
+       [discover-communities-segments selected-tab true]])))
 
 (defn discover-screen-content
-  []
+  [featured-communities theme]
-  (let [view-type     (reagent/atom :card-view)
+  (let [view-type                  (reagent/atom :card-view)
-        selected-tab  (reagent/atom :all)
+        selected-tab               (reagent/atom :all)
-        scroll-height (reagent/atom 0)]
+        scroll-height              (reagent/atom 0)
+        featured-communities-count (count featured-communities)]
     (fn []
-      (let [theme                      (quo.theme/use-theme)
+      [scroll-page/scroll-page
-            featured-communities       (rf/sub [:communities/featured-contract-communities])
+       {:on-scroll        #(reset! scroll-height %)
-            featured-communities-count (count featured-communities)]
+        :page-nav-props   {:background :blur}
-        [scroll-page/scroll-page
+        :navigate-back?   :true
-         {:on-scroll        #(reset! scroll-height %)
+        :height           (if (> @scroll-height 360)
-          :page-nav-props   {:background :blur}
+                            208
-          :navigate-back?   :true
+                            148)
-          :height           (if (> @scroll-height 360)
+        :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
-                              208
+        :sticky-header    [render-sticky-header
-                              148)
+                           {:selected-tab  selected-tab
-          :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
+                            :scroll-height scroll-height}]}
-          :sticky-header    [render-sticky-header
+
-                             {:selected-tab  selected-tab
+       [render-communities
-                              :scroll-height scroll-height}]}
+        selected-tab
-         [render-communities
+        featured-communities-count
-          {:selected-tab               selected-tab
+        featured-communities
-           :featured-communities-count featured-communities-count
+        @view-type]])))
-           :featured-communities       featured-communities
-           :view-type                  @view-type}]]))))
 
 (defn view
   []
-  (let [theme (quo.theme/use-theme)]
+  (let [theme                (quo.theme/use-theme)
+        featured-communities (rf/sub [:communities/featured-contract-communities])]
     (rn/use-mount #(rf/dispatch [:fetch-contract-communities]))
     [rn/view
      {:style (style/discover-screen-container (colors/theme-colors
                                                colors/white
                                                colors/neutral-95
                                                theme))}
-     [discover-screen-content]]))
+     [discover-screen-content featured-communities theme]]))

src/status_im/contexts/keycard/backup/view.cljs

@@ -15,10 +15,10 @@
      :on-press  events-helper/navigate-back}]
    [quo/page-top
     {:title (i18n/label :t/ready-add-keypair-keycard)}]
-   [rn/image
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    {:resize-mode :contain
+    [rn/image
-     :style       {:flex 1 :width (:width (rn/get-window))}
+     {:resize-mode :contain
-     :source      (resources/get-image :keycard-migration)}]
+      :source      (resources/get-image :keycard-migration)}]]
    [common.view/tips]
    [quo/bottom-actions
     {:actions          :one-action
@@ -33,11 +33,8 @@
      :on-press  events-helper/navigate-back}]
    [quo/page-top
     {:title (i18n/label :t/backup-keycard-created)}]
-   [rn/image
+   [rn/view {:style {:flex 1}}]
-    {:resize-mode :contain
+   [rn/view {:style {:padding-horizontal 20}}
-     :style       {:flex 1 :width (:width (rn/get-window))}
-     :source      (resources/get-image :keycard-backup-positive)}]
-   [rn/view {:style {:padding-horizontal 20 :padding-vertical 12}}
     [quo/button {:on-press events-helper/navigate-back}
      (i18n/label :t/done)]]])
 
@@ -52,10 +49,7 @@
       {:title            (i18n/label :t/keycard-not-empty)
        :description      :text
        :description-text (i18n/label :t/scan-empty-keycard)}]
-     [rn/image
+     [rn/view {:style {:flex 1}}]
-      {:resize-mode :contain
-       :style       {:flex 1 :width (:width (rn/get-window))}
-       :source      (resources/get-image :keycard-not-empty)}]
      [common.view/tips]
      [rn/view {:style {:padding-horizontal 20}}
       [quo/button {:on-press on-press}
@@ -71,10 +65,10 @@
     {:title            (i18n/label :t/scan-empty-keycard)
      :description      :text
      :description-text (i18n/label :t/backup-empty-keycard-only)}]
-   [rn/image
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    {:resize-mode :contain
+    [rn/image
-     :style       {:flex 1 :width (:width (rn/get-window))}
+     {:resize-mode :contain
-     :source      (resources/get-image :check-your-keycard)}]
+      :source      (resources/get-image :check-your-keycard)}]]
    [common.view/tips]
    [quo/bottom-actions
     {:actions          :one-action

src/status_im/contexts/keycard/change_pin/view.cljs

@@ -2,7 +2,6 @@
   (:require [quo.core :as quo]
             [react-native.core :as rn]
             [status-im.common.events-helper :as events-helper]
-            [status-im.common.resources :as resources]
             [status-im.contexts.keycard.common.view :as common.view]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
@@ -33,10 +32,9 @@
      :on-press  events-helper/navigate-back}]
    [quo/page-top
     {:title (i18n/label :t/ready-to-change-pin)}]
-   [rn/image
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    {:resize-mode :contain
+    [rn/image
-     :style       {:flex 1 :width (:width (rn/get-window))}
+     {:resize-mode :contain}]]
-     :source      (resources/get-image :keycard-change-pin)}]
    [common.view/tips]
    [quo/bottom-actions
     {:actions          :one-action
@@ -54,10 +52,9 @@
     {:title            (i18n/label :t/keycard-pin-changed)
      :description      :text
      :description-text (i18n/label :t/keycard-pin-changed-description)}]
-   [rn/image
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    {:resize-mode :contain
+    [rn/image
-     :style       {:flex 1 :width (:width (rn/get-window))}
+     {:resize-mode :contain}]]
-     :source      (resources/get-image :keycard-change-pin-positive)}]
    [quo/bottom-actions
     {:actions          :one-action
      :button-one-label (i18n/label :t/done)
@@ -73,10 +70,9 @@
     {:title            (i18n/label :t/keycard-pin-change-failed)
      :description      :text
      :description-text (i18n/label :t/keycard-pin-change-failed-description)}]
-   [rn/image
+   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    {:resize-mode :contain
+    [rn/image
-     :style       {:flex 1 :width (:width (rn/get-window))}
+     {:resize-mode :contain}]]
-     :source      (resources/get-image :keycard-change-pin-negative)}]
    [common.view/tips]
    [quo/bottom-actions
     {:actions          :one-action

src/status_im/contexts/keycard/check/view.cljs

@@ -42,10 +42,10 @@
       {:title            (i18n/label :t/check-keycard)
        :description      :text
        :description-text (i18n/label :t/see-keycard-ready)}]
-     [rn/image
+     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      {:resize-mode :contain
+      [rn/image
-       :style       {:flex 1 :width (:width (rn/get-window))}
+       {:resize-mode :contain
-       :source      (resources/get-image :check-your-keycard)}]
+        :source      (resources/get-image :check-your-keycard)}]]
      [common.view/tips]
      [quo/bottom-actions
       {:actions          :one-action

src/status_im/contexts/keycard/different_card/view.cljs

@@ -2,7 +2,6 @@
   (:require [quo.core :as quo]
             [react-native.core :as rn]
             [status-im.common.events-helper :as events-helper]
-            [status-im.common.resources :as resources]
             [utils.i18n :as i18n]))
 
 (defn view
@@ -15,11 +14,8 @@
     {:title            (i18n/label :t/different-keycard)
      :description      :text
      :description-text (i18n/label :t/scan-previous-keycard)}]
-   [rn/image
+   [rn/view {:style {:flex 1}}]
-    {:resize-mode :contain
+   [rn/view {:style {:padding-horizontal 20}}
-     :style       {:flex 1 :width (:width (rn/get-window))}
-     :source      (resources/get-image :keycard-not-same)}]
-   [rn/view {:style {:padding-horizontal 20 :padding-vertical 12}}
     [quo/button {:on-press events-helper/navigate-back}
      (i18n/label :t/try-again)]]])
 

src/status_im/contexts/keycard/error/view.cljs

@@ -23,7 +23,6 @@
 (defn view
   []
   (let [error                       (rf/sub [:keycard/application-info-error])
-        logged-in?                  (rf/sub [:multiaccount/logged-in?])
         {:keys [title description]} (get titles error)]
     [:<>
      [quo/page-nav
@@ -38,31 +37,21 @@
       [quo/section-label
        {:section (i18n/label :t/what-you-can-do) :container-style {:padding-vertical 8}}]
       (if (= error :keycard/error.keycard-empty)
-        (if logged-in?
+        [quo/settings-item
-          [quo/settings-item
+         {:title             (i18n/label :t/use-backup-keycard)
-           {:title             (i18n/label :t/use-backup-keycard)
+          :image             :icon
-            :image             :icon
+          :image-props       :i/placeholder
-            :image-props       :i/placeholder
+          :action            :arrow
-            :action            :arrow
+          :description       :text
-            :description       :text
+          :description-props {:text (i18n/label :t/create-backup-profile-keycard)}
-            :description-props {:text (i18n/label :t/create-backup-profile-keycard)}
+          :on-press          (fn []
-            :on-press          (fn []
+                               (rf/dispatch [:show-bottom-sheet
-                                 (rf/dispatch [:show-bottom-sheet
+                                             {:content
-                                               {:content
+                                              (fn []
-                                                (fn []
+                                                [backup.view/sheet
-                                                  [backup.view/sheet
+                                                 {:on-continue
-                                                   {:on-continue
+                                                  (rf/dispatch
-                                                    (rf/dispatch
+                                                   [:keycard/backup.create-or-enter-pin])}])}]))}]
-                                                     [:keycard/backup.create-or-enter-pin])}])}]))}]
-          [quo/settings-item
-           {:title             (i18n/label :t/create-new-profile)
-            :image             :icon
-            :image-props       :i/profile
-            :action            :arrow
-            :description       :text
-            :description-props {:text (i18n/label :t/new-key-pair-keycard)}
-            :on-press          (fn []
-                                 (rf/dispatch [:keycard/create.get-phrase]))}])
         [:<>
          (when (or (= error :keycard/error.keycard-frozen)
                    (= error :keycard/error.keycard-locked))

src/status_im/contexts/keycard/factory_reset/view.cljs

@@ -2,7 +2,6 @@
   (:require [quo.core :as quo]
             [react-native.core :as rn]
             [status-im.common.events-helper :as events-helper]
-            [status-im.common.resources :as resources]
             [utils.i18n :as i18n]
             [utils.re-frame :as rf]))
 
@@ -49,11 +48,8 @@
     {:title            (i18n/label :t/keycard-reset-success)
      :description      :text
      :description-text (i18n/label :t/keycard-empty-ready)}]
-   [rn/image
+   [rn/view {:style {:flex 1}}]
-    {:resize-mode :contain
+   [rn/view {:style {:padding-horizontal 20}}
-     :style       {:flex 1 :width (:width (rn/get-window))}
-     :source      (resources/get-image :keycard-reset-positive)}]
-   [rn/view {:style {:padding-horizontal 20 :padding-vertical 12}}
     [quo/button {:on-press events-helper/navigate-back}
      (i18n/label :t/done)]]])
 
@@ -65,11 +61,8 @@
      :on-press  events-helper/navigate-back}]
    [quo/page-top
     {:title (i18n/label :t/keycard-reset-failed)}]
-   [rn/image
+   [rn/view {:style {:flex 1}}]
-    {:resize-mode :contain
+   [rn/view {:style {:padding-horizontal 20}}
-     :style       {:flex 1 :width (:width (rn/get-window))}
-     :source      (resources/get-image :keycard-reset-negative)}]
-   [rn/view {:style {:padding-horizontal 20 :padding-vertical 12}}
     [quo/button {:on-press events-helper/navigate-back}
      (i18n/label :t/try-again)]]])
 

src/status_im/contexts/keycard/migrate/fail/view.cljs

@@ -19,10 +19,10 @@
                          :profile-picture     profile-picture
                          :customization-color customization-color}
        :container-style {:margin-top constants/page-nav-height}}]
-     [rn/image
+     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      {:resize-mode :contain
+      [rn/image
-       :style       {:flex 1 :width (:width (rn/get-window))}
+       {:resize-mode :contain
-       :source      (resources/get-image :keycard-migration-failed)}]
+        :source      (resources/get-image :keycard-migration-failed)}]]
      [quo/divider-label (i18n/label :t/what-you-can-do)]
      [quo/markdown-list {:description (i18n/label :t/keycard-migration-failed-instruction-1)}]
      [quo/markdown-list {:description (i18n/label :t/keycard-migration-failed-instruction-2)}]

src/status_im/contexts/keycard/migrate/re_encrypting/events.cljs

@@ -27,7 +27,5 @@
              :callback
              (fn [{:keys [error]}]
                (if (string/blank? error)
-                 (do
+                 (rf/dispatch [:navigate-to :screen/keycard.migrate.success])
-                   (rf/dispatch [:biometric/disable])
-                   (rf/dispatch [:navigate-to :screen/keycard.migrate.success]))
                  (rf/dispatch [:navigate-to :screen/keycard.migrate.fail])))}]]})))

src/status_im/contexts/keycard/migrate/re_encrypting/view.cljs

@@ -21,7 +21,7 @@
        :container-style {:margin-top constants/page-nav-height}}]
      [quo/text {:style {:padding-horizontal 20}}
       (i18n/label :t/do-not-quit)]
-     [rn/image
+     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      {:resize-mode :contain
+      [rn/image
-       :style       {:flex 1 :width (:width (rn/get-window))}
+       {:resize-mode :contain
-       :source      (resources/get-image :keycard-migration)}]]))
+        :source      (resources/get-image :keycard-migration)}]]]))

src/status_im/contexts/keycard/migrate/success/view.cljs

@@ -21,11 +21,11 @@
        :container-style {:margin-top constants/page-nav-height}}]
      [quo/text {:style {:padding-horizontal 20}}
       (i18n/label :t/use-keycard-for-status)]
-     [rn/image
+     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      {:resize-mode :contain
+      [rn/image
-       :style       {:flex 1 :width (:width (rn/get-window))}
+       {:resize-mode :contain
-       :source      (resources/get-image :keycard-migration-succeeded)}]
+        :source      (resources/get-image :keycard-migration-succeeded)}]]
      [quo/button
       {:on-press        #(rf/dispatch [:profile/logout])
-       :container-style {:margin-horizontal 20 :margin-vertical 12}}
+       :container-style {:margin-horizontal 20}}
       (i18n/label :t/logout)]]))