Added log level error as requested by @qfrank

disable logging
_TEMPORARY_ enabled all logging in release for testing purposes (#22192 )
2025-02-27 11:32:37 +00:00 · 2025-02-27 11:26:46 +00:00 · 2025-02-26 11:36:41 +00:00 · 2025-02-26 10:35:02 +00:00 · 2025-02-26 09:34:52 +00:00 · 2025-02-25 16:20:17 +01:00
126 changed files with 1479 additions and 963 deletions
@@ -36,3 +36,5 @@ 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
@@ -40,3 +40,5 @@ 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
@@ -37,3 +37,5 @@ TEST_NETWORKS_ENABLED=1
 ENABLE_ALERT_BANNER=1
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
+SENTRY_ENABLED=0
+SENTRY_ENVIRONMENT=ci-main
@@ -24,3 +24,5 @@ TEST_NETWORKS_ENABLED=0
 ENABLE_ALERT_BANNER=1
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=1
+SENTRY_ENABLED=1
+SENTRY_ENVIRONMENT=ci-nightly
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=
+LOG_LEVEL=error
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -21,3 +21,5 @@ TEST_NETWORKS_ENABLED=0
 STATUS_PROXY_STAGE_NAME=prod
 FLAG_WALLET_CONNECT_ENABLED=1
 API_LOGGING_ENABLED=0
+SENTRY_ENABLED=1
+SENTRY_ENVIRONMENT=production
@@ -1 +1 @@
-2.32.0
+2.33.0
@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.18'
+library 'status-jenkins-lib@v1.9.20'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -41,6 +41,7 @@ pipeline {
    BUILD_ENV = 'prod'
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    FASTLANE_DISABLE_COLORS = 1
+    SENTRY_PRODUCTION = "${utils.isReleaseBuild() ? 'true' : 'false'}"
  }

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

 import groovy.json.JsonBuilder

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

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

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -41,6 +41,7 @@ pipeline {
    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
    FASTLANE_DISABLE_COLORS = 1
    BUNDLE_PATH = "${HOME}/.bundle"
+    SENTRY_PRODUCTION = "${utils.isReleaseBuild() ? 'true' : 'false'}"
  }

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

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

 pipeline {

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

 pipeline {

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

 pipeline {

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

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

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

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

 pipeline {
  agent {
@@ -35,6 +35,11 @@ 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()

@@ -156,6 +161,7 @@ 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()) {
@@ -175,6 +181,9 @@ 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)
@@ -205,6 +214,7 @@ 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"
    }
 }
@@ -108,6 +108,15 @@ 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(
@@ -35,6 +35,7 @@ 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"];

@@ -46,6 +47,10 @@ 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];
@@ -109,6 +109,17 @@ 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:@""
@@ -6,6 +6,7 @@ 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}"
@@ -25,16 +26,28 @@ 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:31.1.1
+com.android.tools.lint:lint-gradle:$lint_version
 EOF
@@ -10,6 +10,7 @@ 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";
@@ -48,6 +48,10 @@ 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
@@ -45,8 +45,9 @@ SECRETS_ENV_VARS=(
    'INFURA_TOKEN_SECRET'
    'OPENSEA_API_KEY'
    'MIXPANEL_APP_ID'
-    'MIXPANEL_TOKEN'
+    'MIXPANEL_APP_TOKEN'
    'POKT_TOKEN'
+    'SENTRY_DSN_STATUS_GO'
 )

 # Secrets like this can't be passed via args or they end up in derivation.
@@ -77,8 +77,13 @@
     #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_TOKEN #shadow/env "MIXPANEL_TOKEN"
+     status-im.config/MIXPANEL_APP_TOKEN #shadow/env "MIXPANEL_APP_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"
@@ -119,9 +124,10 @@
     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_TOKEN                      #shadow/env "MIXPANEL_TOKEN"
+     status-im.config/MIXPANEL_APP_TOKEN                  #shadow/env "MIXPANEL_APP_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"
@@ -168,7 +174,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_TOKEN                 #shadow/env "MIXPANEL_TOKEN"
+    status-im.config/MIXPANEL_APP_TOKEN             #shadow/env "MIXPANEL_APP_TOKEN"
    status-im.config/RARIBLE_MAINNET_API_KEY        #shadow/env "RARIBLE_MAINNET_API_KEY"
    status-im.config/RARIBLE_TESTNET_API_KEY        #shadow/env "RARIBLE_TESTNET_API_KEY"
    status-im.config/ALCHEMY_ETHEREUM_MAINNET_TOKEN #shadow/env "ALCHEMY_ETHEREUM_MAINNET_TOKEN"
@@ -1,10 +1,13 @@
 (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]))
@@ -17,7 +20,16 @@
           peer-syncing-enabled?]}]
  (keep
   identity
-   [{:size :small
+   [(when (ff/enabled? ::ff/app-monitoring.intentional-crash)
+      {: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
@@ -569,3 +569,7 @@
   (.createAccountFromPrivateKey ^js (account-manager)
                                 (types/clj->json {:privateKey private-key})
                                 callback)))
+
+(defn intended-panic
+  [message]
+  (.intendedPanic ^js (status) message))
@@ -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,10 +63,12 @@
        [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}]]
-        [rn/view {:style (style/community-tags-position)}
+          {:type                 :card-view
+           :members-count        (:members-count community)
+           :active-members-count (:active-members-count community)}]]
+        [rn/view {:style style/community-tags-position}
         [community-view/community-tags {:tags tags}]]]]]]))

 (defn view
@@ -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
@@ -11,11 +11,8 @@
    [react-native.gesture :as gesture]))

 (defn community-stats-column
-  [{:keys [type members-count active-count]}]
-  [rn/view
-   (if (= type :card-view)
-     (style/card-stats-container)
-     (style/list-stats-container))
+  [{:keys [type members-count active-members-count]}]
+  [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
@@ -24,7 +21,7 @@
   [community-stat/view
    {:accessibility-label :stats-active-count
     :icon                :i/active-members
-     :value               active-count}]])
+     :value               active-members-count}]])

 (defn community-tags
  [{:keys [tags container-style last-item-style]}]
@@ -17,24 +17,20 @@
 (def detail-container
  {:flex 1})

-(defn card-stats-container
-  []
+(def card-stats-container
  {:flex-direction :row})

-(defn list-stats-container
-  []
+(def list-stats-container
  {:flex-direction :row
   :align-items    :center})

-(defn card-stats-position
-  []
+(def card-stats-position
  {:position :absolute
   :top      116
   :right    12
   :left     12})

-(defn community-tags-position
-  []
+(def community-tags-position
  {:position :absolute
   :top      154
   :right    12
@@ -68,8 +64,7 @@
                      colors/neutral-90
                      theme)})

-(defn membership-info-container
-  []
+(def membership-info-container
  {:flex-direction :row
   :border-radius  16
   :align-items    :center
@@ -87,8 +82,7 @@
   :border-top-left-radius  20
   :background-color        colors/primary-50-opa-20})

-(defn permission-tag-styles
-  []
+(def permission-tag-styles
  {:position :absolute
   :top      8
   :right    8})
@@ -146,10 +140,14 @@
   :background-color   (colors/theme-colors colors/white colors/neutral-90 theme)})

 (def loading-tags-container
-  {:margin-top 20 :flex-direction :row :align-items :center})
+  {:margin-top     20
+   :flex-direction :row
+   :align-items    :center})

 (def loading-stats-container
-  {:margin-top 20 :flex-direction :row :align-items :center})
+  {:margin-top     20
+   :flex-direction :row
+   :align-items    :center})

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

-  (h/test "Networks false render"
+(h/describe "Wallet: network summary info"
+  (h/test "Type of `network` title renders"
    (h/render-with-theme-provider [summary-info/view
-                                   {:type          :status-account
-                                    :networks?     false
-                                    :values        {:ethereum 150
-                                                    :optimism 50
-                                                    :arbitrum 25}
-                                    :account-props status-account-props}])
-    (h/is-null (h/query-by-label-text :networks))))
+                                   {:type          :network
+                                    :network-props {:full-name    "Ethereum"
+                                                    :network-name :ethereum}}])
+    (h/is-truthy (h/get-by-text "Ethereum"))))
@@ -5,9 +5,9 @@
   [:catn
    [:props
     [:map
-      [:type [:enum :status-account :saved-account :account :user :token]]
+      [:type [:enum :status-account :saved-account :account :user :token :network]]
      [:account-props {:optional true} [:maybe :map]]
+      [:network-props {:optional true} [:maybe :map]]
      [:token-props {:optional true} [:maybe :map]]
-      [:networks? {:optional true} [:maybe :boolean]]
-      [:values {:optional true} [:maybe :map]]]]]
+      [:networks-to-show {:optional true} [:maybe :map]]]]]
   :any])
@@ -3,13 +3,13 @@
    [quo.foundations.colors :as colors]))

 (defn container
-  [networks? theme]
+  [networks-to-show? theme]
  {:width         "100%"
-   :height        (if networks? 90 56)
+   :height        (if networks-to-show? 90 56)
   :border-radius 16
   :border-width  1
   :border-color  (colors/theme-colors colors/neutral-10 colors/neutral-80 theme)
-   :margin-bottom (if networks? 4 8)})
+   :margin-bottom (if networks-to-show? 4 8)})

 (def info-container
  {:flex-direction     :row
@@ -39,3 +39,7 @@
   :height             32
   :flex-direction     :row
   :align-items        :center})
+
+(def network-icon
+  {:width  32
+   :height 32})
@@ -28,50 +28,35 @@
     [rn/view
      {:style (style/dot-divider theme)}])])

+(def ^:private default-token-symbols
+  {:ethereum "ETH"
+   :optimism "OP"
+   :arbitrum "ARB"
+   :base     "ETH"})
+
 (defn networks
-  [values theme]
-  (let [{:keys [ethereum optimism arbitrum base]} values
-        show-optimism?                            (and optimism
-                                                       (or (pos? (:amount optimism))
-                                                           (= (:amount optimism) "<0.01")))
-        show-arbitrum?                            (and arbitrum
-                                                       (or (pos? (:amount arbitrum))
-                                                           (= (:amount arbitrum) "<0.01")))
-        show-base?                                (and base
-                                                       (or (pos? (:amount base))
-                                                           (= (:amount base) "<0.01")))]
-    [rn/view
-     {:style               style/networks-container
-      :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}])]))
+  [networks-to-show theme]
+  (->> networks-to-show
+       (map-indexed
+        (fn [i [k {:keys [amount token-symbol]}]]
+          (when (or (pos? amount)
+                    (= amount "<0.01"))
+            [network-amount
+             {:network  k
+              :amount   (str amount " " (or token-symbol (get default-token-symbols k)))
+              :divider? (not= (dec i) (-> networks-to-show keys count))
+              :theme    theme}])))
+       (remove nil?)
+       (into [rn/view
+              {:style               style/networks-container
+               :accessibility-label :networks}])))

 (defn- view-internal
-  [{:keys [type account-props token-props networks? values]}]
+  [{:keys [type account-props network-props token-props networks-to-show]}]
  (let [theme   (quo.theme/use-theme)
        address (or (:address account-props) (:address token-props))]
    [rn/view
-     {:style (style/container networks? theme)}
+     {:style (style/container (seq? networks-to-show) theme)}
     [rn/view
      {:style style/info-container}
      (case type
@@ -82,16 +67,26 @@
                         (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= type :account)
-         [text/text {:weight :semi-bold} (or (:name account-props) (:label token-props))])
+       (when (not (some #{type} [:account :network]))
+         [text/text
+          {: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}} [account-avatar/view (:status-account account-props)]]
+           [rn/view {:style {:margin-right 4}}
+            [account-avatar/view (:status-account account-props)]]
           [text/text
            {:size  :paragraph-2
             :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
@@ -105,10 +100,10 @@
            :style  {:color (when (not= type :account)
                              (colors/theme-colors colors/neutral-50 colors/neutral-40 theme))}}
           address])]]]
-     (when networks?
+     (when networks-to-show
       [:<>
        [rn/view
         {:style (style/line-divider theme)}]
-        [networks values theme]])]))
+        [networks networks-to-show theme]])]))

 (def view (schema/instrument #'view-internal summary-info-schema/?schema))
@@ -0,0 +1,8 @@
+(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)))
@@ -0,0 +1,8 @@
+(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]]}))
@@ -26,9 +26,19 @@
   :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")
@@ -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,8 +53,16 @@
 (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_TOKEN)
+(def mixpanel-token MIXPANEL_APP_TOKEN)

 (def opensea-api-key OPENSEA_API_KEY)
 (def status-proxy-enabled? true)
@@ -136,3 +144,8 @@

 (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)
@@ -443,7 +443,10 @@
 (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)
@@ -18,7 +18,9 @@
      :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" request-to-join-id %)}]}))
+      :on-error    #(log/error "failed to cancel request to join community"
+                               request-to-join-id
+                               %)}]}))

 (rf/reg-event-fx :communities/left
 (fn [_ [response-js]]
@@ -34,8 +34,7 @@

 (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
@@ -95,14 +94,14 @@

 (defn featured-list
  [communities view-type]
-  (let [view-size (reagent/atom 0)
-        loaded?   (and communities (pos? (count communities)))]
+  (let [view-size     (reagent/atom 0)
+        set-view-size (fn [e]
+                        (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 #(swap! view-size
-                      (fn [_]
-                        (- (oops/oget % "nativeEvent.layout.width") 40)))}
+        :on-layout set-view-size}
       (when-not (= @view-size 0)
         [rn/flat-list
          {:key-fn                            :id
@@ -132,32 +131,29 @@
   [discover-communities-segments selected-tab false]])

 (defn other-communities-list
-  [{:keys [communities communities-ids view-type]}]
+  [{:keys [communities view-type]}]
  [rn/view {:style style/other-communities-container}
-   (if (and communities (pos? (count communities)))
-     (map-indexed
-      (fn [inner-index item]
-        (let [community-id (when communities-ids item)
-              community    (if communities
-                             item
-                             (rf/sub [:communities/home-item community-id]))
-              cover        {:uri (get-in (:images item) [:banner :uri])}]
-          [rn/view
-           {:key           (str inner-index (:id community))
-            :margin-bottom 16}
-           (if (= view-type :card-view)
-             [quo/community-card-view-item
-              {:community (assoc community :cover cover)
-               :on-press  #(rf/dispatch [:communities/navigate-to-community-overview (:id community)])}]
-
-             [quo/community-list
-              {:on-press      (fn []
-                                (rf/dispatch [:dismiss-keyboard])
-                                (rf/dispatch [:communities/navigate-to-community-overview
-                                              (:id community)]))
-               :on-long-press #(js/alert "TODO: to be implemented")}
-              community])]))
-      (if communities communities communities-ids))
+   (if (seq communities)
+     (map-indexed (fn [inner-index {community-id :id :as community}]
+                    (let [cover {:uri (-> community :images :banner :uri)}]
+                      [rn/view
+                       {:key   (str inner-index community-id)
+                        :style {:margin-bottom 16}}
+                       (if (= view-type :card-view)
+                         [quo/community-card-view-item
+                          {:community (assoc community
+                                             :cover         cover
+                                             :members-count (count (:members community)))
+                           :on-press  #(rf/dispatch [:communities/navigate-to-community-overview
+                                                     community-id])}]
+                         [quo/community-list
+                          {:on-press      (fn []
+                                            (rf/dispatch [:dismiss-keyboard])
+                                            (rf/dispatch [:communities/navigate-to-community-overview
+                                                          community-id]))
+                           :on-long-press #(js/alert "TODO: to be implemented")}
+                          community])]))
+                  communities)
     [:<>
      [rn/view {:margin-bottom 16} [quo/community-card-view-item {:loading? true}]]
      [rn/view {:margin-bottom 16} [quo/community-card-view-item {:loading? true}]]
@@ -168,8 +164,9 @@
  [rn/view {:style {:flex 1}}
   (case @selected-tab
     :all
-     (other-communities-list {:communities (rf/sub [:communities/other-contract-communities])
-                              :view-type   view-type})
+     [other-communities-list
+      {:communities (rf/sub [:communities/other-contract-communities])
+       :view-type   view-type}]

     :open
     [:<>]
@@ -183,60 +180,55 @@
      (i18n/label :t/error)])])

 (defn render-communities
-  [selected-tab
-   featured-communities-count
-   featured-communities
-   view-type]
-  (fn []
-    [rn/view
-     [discover-communities-header
-      {:selected-tab               selected-tab
-       :view-type                  view-type
-       :featured-communities-count featured-communities-count
-       :featured-communities       featured-communities}]
-     [communities-lists selected-tab view-type]]))
+  [{:keys [selected-tab featured-communities-count featured-communities view-type]}]
+  [rn/view
+   [discover-communities-header
+    {: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]}]
-  (fn []
-    (when (> @scroll-height 360)
-      [rn/view
-       {:style (style/blur-tabs-header (safe-area/get-top))}
-       [discover-communities-segments selected-tab true]])))
+  (when (> @scroll-height 360)
+    [rn/view
+     {: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)
-        selected-tab               (reagent/atom :all)
-        scroll-height              (reagent/atom 0)
-        featured-communities-count (count featured-communities)]
+  []
+  (let [view-type     (reagent/atom :card-view)
+        selected-tab  (reagent/atom :all)
+        scroll-height (reagent/atom 0)]
    (fn []
-      [scroll-page/scroll-page
-       {:on-scroll        #(reset! scroll-height %)
-        :page-nav-props   {:background :blur}
-        :navigate-back?   :true
-        :height           (if (> @scroll-height 360)
-                            208
-                            148)
-        :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
-        :sticky-header    [render-sticky-header
-                           {:selected-tab  selected-tab
-                            :scroll-height scroll-height}]}
-
-       [render-communities
-        selected-tab
-        featured-communities-count
-        featured-communities
-        @view-type]])))
+      (let [theme                      (quo.theme/use-theme)
+            featured-communities       (rf/sub [:communities/featured-contract-communities])
+            featured-communities-count (count featured-communities)]
+        [scroll-page/scroll-page
+         {:on-scroll        #(reset! scroll-height %)
+          :page-nav-props   {:background :blur}
+          :navigate-back?   :true
+          :height           (if (> @scroll-height 360)
+                              208
+                              148)
+          :background-color (colors/theme-colors colors/white colors/neutral-95 theme)
+          :sticky-header    [render-sticky-header
+                             {:selected-tab  selected-tab
+                              :scroll-height scroll-height}]}
+         [render-communities
+          {:selected-tab               selected-tab
+           :featured-communities-count featured-communities-count
+           :featured-communities       featured-communities
+           :view-type                  @view-type}]]))))

 (defn view
  []
-  (let [theme                (quo.theme/use-theme)
-        featured-communities (rf/sub [:communities/featured-contract-communities])]
+  (let [theme (quo.theme/use-theme)]
    (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 featured-communities theme]]))
+     [discover-screen-content]]))
@@ -15,10 +15,10 @@
     :on-press  events-helper/navigate-back}]
   [quo/page-top
    {:title (i18n/label :t/ready-add-keypair-keycard)}]
-   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    [rn/image
-     {:resize-mode :contain
-      :source      (resources/get-image :keycard-migration)}]]
+   [rn/image
+    {:resize-mode :contain
+     :style       {:flex 1 :width (:width (rn/get-window))}
+     :source      (resources/get-image :keycard-migration)}]
   [common.view/tips]
   [quo/bottom-actions
    {:actions          :one-action
@@ -33,8 +33,11 @@
     :on-press  events-helper/navigate-back}]
   [quo/page-top
    {:title (i18n/label :t/backup-keycard-created)}]
-   [rn/view {:style {:flex 1}}]
-   [rn/view {:style {:padding-horizontal 20}}
+   [rn/image
+    {:resize-mode :contain
+     :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)]]])

@@ -49,7 +52,10 @@
      {:title            (i18n/label :t/keycard-not-empty)
       :description      :text
       :description-text (i18n/label :t/scan-empty-keycard)}]
-     [rn/view {:style {:flex 1}}]
+     [rn/image
+      {: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}
@@ -65,10 +71,10 @@
    {:title            (i18n/label :t/scan-empty-keycard)
     :description      :text
     :description-text (i18n/label :t/backup-empty-keycard-only)}]
-   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    [rn/image
-     {:resize-mode :contain
-      :source      (resources/get-image :check-your-keycard)}]]
+   [rn/image
+    {:resize-mode :contain
+     :style       {:flex 1 :width (:width (rn/get-window))}
+     :source      (resources/get-image :check-your-keycard)}]
   [common.view/tips]
   [quo/bottom-actions
    {:actions          :one-action
@@ -2,6 +2,7 @@
  (: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]))
@@ -32,9 +33,10 @@
     :on-press  events-helper/navigate-back}]
   [quo/page-top
    {:title (i18n/label :t/ready-to-change-pin)}]
-   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    [rn/image
-     {:resize-mode :contain}]]
+   [rn/image
+    {:resize-mode :contain
+     :style       {:flex 1 :width (:width (rn/get-window))}
+     :source      (resources/get-image :keycard-change-pin)}]
   [common.view/tips]
   [quo/bottom-actions
    {:actions          :one-action
@@ -52,9 +54,10 @@
    {:title            (i18n/label :t/keycard-pin-changed)
     :description      :text
     :description-text (i18n/label :t/keycard-pin-changed-description)}]
-   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    [rn/image
-     {:resize-mode :contain}]]
+   [rn/image
+    {:resize-mode :contain
+     :style       {:flex 1 :width (:width (rn/get-window))}
+     :source      (resources/get-image :keycard-change-pin-positive)}]
   [quo/bottom-actions
    {:actions          :one-action
     :button-one-label (i18n/label :t/done)
@@ -70,9 +73,10 @@
    {:title            (i18n/label :t/keycard-pin-change-failed)
     :description      :text
     :description-text (i18n/label :t/keycard-pin-change-failed-description)}]
-   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    [rn/image
-     {:resize-mode :contain}]]
+   [rn/image
+    {:resize-mode :contain
+     :style       {:flex 1 :width (:width (rn/get-window))}
+     :source      (resources/get-image :keycard-change-pin-negative)}]
   [common.view/tips]
   [quo/bottom-actions
    {:actions          :one-action
@@ -42,10 +42,10 @@
      {:title            (i18n/label :t/check-keycard)
       :description      :text
       :description-text (i18n/label :t/see-keycard-ready)}]
-     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      [rn/image
-       {:resize-mode :contain
-        :source      (resources/get-image :check-your-keycard)}]]
+     [rn/image
+      {:resize-mode :contain
+       :style       {:flex 1 :width (:width (rn/get-window))}
+       :source      (resources/get-image :check-your-keycard)}]
     [common.view/tips]
     [quo/bottom-actions
      {:actions          :one-action
@@ -2,6 +2,7 @@
  (: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
@@ -14,8 +15,11 @@
    {:title            (i18n/label :t/different-keycard)
     :description      :text
     :description-text (i18n/label :t/scan-previous-keycard)}]
-   [rn/view {:style {:flex 1}}]
-   [rn/view {:style {:padding-horizontal 20}}
+   [rn/image
+    {:resize-mode :contain
+     :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)]]])

@@ -23,6 +23,7 @@
 (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
@@ -37,21 +38,31 @@
      [quo/section-label
       {:section (i18n/label :t/what-you-can-do) :container-style {:padding-vertical 8}}]
      (if (= error :keycard/error.keycard-empty)
-        [quo/settings-item
-         {:title             (i18n/label :t/use-backup-keycard)
-          :image             :icon
-          :image-props       :i/placeholder
-          :action            :arrow
-          :description       :text
-          :description-props {:text (i18n/label :t/create-backup-profile-keycard)}
-          :on-press          (fn []
-                               (rf/dispatch [:show-bottom-sheet
-                                             {:content
-                                              (fn []
-                                                [backup.view/sheet
-                                                 {:on-continue
-                                                  (rf/dispatch
-                                                   [:keycard/backup.create-or-enter-pin])}])}]))}]
+        (if logged-in?
+          [quo/settings-item
+           {:title             (i18n/label :t/use-backup-keycard)
+            :image             :icon
+            :image-props       :i/placeholder
+            :action            :arrow
+            :description       :text
+            :description-props {:text (i18n/label :t/create-backup-profile-keycard)}
+            :on-press          (fn []
+                                 (rf/dispatch [:show-bottom-sheet
+                                               {:content
+                                                (fn []
+                                                  [backup.view/sheet
+                                                   {:on-continue
+                                                    (rf/dispatch
+                                                     [: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))
@@ -2,6 +2,7 @@
  (: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]))

@@ -48,8 +49,11 @@
    {:title            (i18n/label :t/keycard-reset-success)
     :description      :text
     :description-text (i18n/label :t/keycard-empty-ready)}]
-   [rn/view {:style {:flex 1}}]
-   [rn/view {:style {:padding-horizontal 20}}
+   [rn/image
+    {:resize-mode :contain
+     :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)]]])

@@ -61,8 +65,11 @@
     :on-press  events-helper/navigate-back}]
   [quo/page-top
    {:title (i18n/label :t/keycard-reset-failed)}]
-   [rn/view {:style {:flex 1}}]
-   [rn/view {:style {:padding-horizontal 20}}
+   [rn/image
+    {:resize-mode :contain
+     :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)]]])

@@ -19,10 +19,10 @@
                         :profile-picture     profile-picture
                         :customization-color customization-color}
       :container-style {:margin-top constants/page-nav-height}}]
-     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      [rn/image
-       {:resize-mode :contain
-        :source      (resources/get-image :keycard-migration-failed)}]]
+     [rn/image
+      {:resize-mode :contain
+       :style       {:flex 1 :width (:width (rn/get-window))}
+       :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)}]
@@ -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/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      [rn/image
-       {:resize-mode :contain
-        :source      (resources/get-image :keycard-migration)}]]]))
+     [rn/image
+      {:resize-mode :contain
+       :style       {:flex 1 :width (:width (rn/get-window))}
+       :source      (resources/get-image :keycard-migration)}]]))
@@ -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/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      [rn/image
-       {:resize-mode :contain
-        :source      (resources/get-image :keycard-migration-succeeded)}]]
+     [rn/image
+      {:resize-mode :contain
+       :style       {:flex 1 :width (:width (rn/get-window))}
+       :source      (resources/get-image :keycard-migration-succeeded)}]
     [quo/button
      {:on-press        #(rf/dispatch [:profile/logout])
-       :container-style {:margin-horizontal 20}}
+       :container-style {:margin-horizontal 20 :margin-vertical 12}}
      (i18n/label :t/logout)]]))
@@ -23,10 +23,10 @@
       :context-tag {:full-name           profile-name
                     :profile-picture     profile-picture
                     :customization-color customization-color}}]
-     [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-      [rn/image
-       {:resize-mode :contain
-        :source      (resources/get-image :keycard-migration)}]]
+     [rn/image
+      {:resize-mode :contain
+       :style       {:flex 1 :width (:width (rn/get-window))}
+       :source      (resources/get-image :keycard-migration)}]
     [common.view/tips]
     [quo/bottom-actions
      {:actions          :one-action
@@ -15,10 +15,10 @@
    {:title            (i18n/label :t/oops-not-keycard)
     :description      :text
     :description-text (i18n/label :t/make-sure-keycard)}]
-   [rn/view {:style {:flex 1 :align-items :center :justify-content :center}}
-    [rn/image
-     {:resize-mode :contain
-      :source      (resources/get-image :not-keycard)}]]
-   [rn/view {:style {:padding-horizontal 20}}
+   [rn/image
+    {:resize-mode :contain
+     :style       {:flex 1 :width (:width (rn/get-window))}
+     :source      (resources/get-image :not-keycard)}]
+   [rn/view {:style {:padding-horizontal 20 :padding-vertical 12}}
    [quo/button {:on-press events-helper/navigate-back}
     (i18n/label :t/try-again)]]])
@@ -2,6 +2,7 @@
  (: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]))
@@ -13,9 +14,14 @@
    {:icon-name :i/close
     :on-press  events-helper/navigate-back}]
   [quo/page-top
-    {:title (i18n/label :t/keycard-unblocked)}]
-   [rn/view {:style {:flex 1}}]
-   [rn/view {:style {:padding-horizontal 20}}
+    {:title            (i18n/label :t/keycard-unblocked)
+     :description      :text
+     :description-text (i18n/label :t/keycard-unblocked-description)}]
+   [rn/image
+    {:resize-mode :contain
+     :style       {:flex 1 :width (:width (rn/get-window))}
+     :source      (resources/get-image :keycard-unblock-positive)}]
+   [rn/view {:style {:padding-horizontal 20 :padding-vertical 12}}
    [quo/button {:on-press events-helper/navigate-back}
     (i18n/label :t/done)]]])

@@ -27,7 +33,10 @@
     :on-press  events-helper/navigate-back}]
   [quo/page-top
    {:title (i18n/label :t/ready-to-unblock-keycard)}]
-   [rn/view {:style {:flex 1}}]
+   [rn/image
+    {:resize-mode :contain
+     :style       {:flex 1 :width (:width (rn/get-window))}
+     :source      (resources/get-image :keycard-unblock)}]
   [common.view/tips]
   [quo/bottom-actions
    {:actions          :one-action
@@ -12,17 +12,15 @@
    :options [{:key :status-account}
              {:key :user}
              {:key :saved-account}
-              {:key :account}]}
-   {:key :networks? :type :boolean}])
+              {:key :account}]}])


 (defn view
  []
-  (let [state                (reagent/atom {:type      :status-account
-                                            :networks? true
-                                            :values    {:ethereum {:amount 150}
-                                                        :optimism {:amount 50}
-                                                        :arbitrum {:amount 25}}})
+  (let [state                (reagent/atom {:type             :status-account
+                                            :networks-to-show {:ethereum {:amount 150}
+                                                               :optimism {:amount 50}
+                                                               :arbitrum {:amount 25}}})
        status-account-props {:customization-color :purple
                              :size                32
                              :emoji               "🍑"
@@ -37,6 +37,7 @@
    {:dataDir              (native-module/backup-disabled-data-dir)
     :mixpanelAppId        config/mixpanel-app-id
     :mixpanelToken        config/mixpanel-token
+     :sentryDSN            (if config/sentry-enabled? config/sentry-dsn-status-go "")
     :mediaServerEnableTLS (config/enabled? config/STATUS_BACKEND_SERVER_MEDIA_SERVER_ENABLE_TLS)
     :logEnabled           (not (string/blank? config/log-level))
     :logLevel             config/log-level
@@ -5,6 +5,7 @@
    [clojure.string :as string]
    [status-im.constants :as constants]
    [status-im.contexts.wallet.collectible.utils :as collectible-utils]
+    [status-im.contexts.wallet.send.transaction-settings.core :as transaction-settings]
    [status-im.contexts.wallet.send.utils :as send-utils]
    [utils.collection :as utils.collection]
    [utils.money :as money]
@@ -229,7 +230,8 @@

 (defn new->old-route-path
  [new-path]
-  (let [to-bignumber (fn [k] (-> new-path k money/bignumber))]
+  (let [to-bignumber                          (fn [k] (-> new-path k money/bignumber))
+        suggested-levels-for-max-fees-per-gas (:suggested-levels-for-max-fees-per-gas new-path)]
    {:approval-fee              (to-bignumber :approval-fee)
     :approval-l-1-fee          (to-bignumber :approval-l-1-fee)
     :bonder-fees               (to-bignumber :tx-bonder-fees)
@@ -238,35 +240,34 @@
     :amount-in-locked          (:amount-in-locked new-path)
     :amount-in                 (:amount-in new-path)
     :max-amount-in             (:max-amount-in new-path)
-     :gas-fees                  {:gas-price                "0"
-                                 :base-fee                 (send-utils/convert-to-gwei (:tx-base-fee
-                                                                                        new-path)
-                                                                                       precision)
+     :gas-fees                  {:gas-price "0"
+                                 :base-fee (send-utils/convert-to-gwei (:tx-base-fee
+                                                                        new-path)
+                                                                       precision)
                                 :max-priority-fee-per-gas (send-utils/convert-to-gwei (:tx-priority-fee
                                                                                        new-path)
                                                                                       precision)
-                                 :max-fee-per-gas-low      (send-utils/convert-to-gwei
-                                                            (get-in
-                                                             new-path
-                                                             [:suggested-levels-for-max-fees-per-gas
-                                                              :low])
-                                                            precision)
-                                 :max-fee-per-gas-medium   (send-utils/convert-to-gwei
-                                                            (get-in
-                                                             new-path
-                                                             [:suggested-levels-for-max-fees-per-gas
-                                                              :medium])
-                                                            precision)
-                                 :max-fee-per-gas-high     (send-utils/convert-to-gwei
-                                                            (get-in
-                                                             new-path
-                                                             [:suggested-levels-for-max-fees-per-gas
-                                                              :high])
-                                                            precision)
-                                 :l-1-gas-fee              (send-utils/convert-to-gwei (:tx-l-1-fee
-                                                                                        new-path)
-                                                                                       precision)
-                                 :eip-1559-enabled         true}
+                                 :l-1-gas-fee (send-utils/convert-to-gwei (:tx-l-1-fee
+                                                                           new-path)
+                                                                          precision)
+                                 :eip-1559-enabled true
+                                 :tx-max-fees-per-gas (send-utils/convert-to-gwei
+                                                       (:tx-max-fees-per-gas
+                                                        new-path)
+                                                       precision)
+                                 :suggested-gas-fees-for-setting
+                                 {:tx-fee-mode/normal (send-utils/convert-to-gwei
+                                                       (:low
+                                                        suggested-levels-for-max-fees-per-gas)
+                                                       precision)
+                                  :tx-fee-mode/fast   (send-utils/convert-to-gwei
+                                                       (:medium
+                                                        suggested-levels-for-max-fees-per-gas)
+                                                       precision)
+                                  :tx-fee-mode/urgent (send-utils/convert-to-gwei
+                                                       (:high
+                                                        suggested-levels-for-max-fees-per-gas)
+                                                       precision)}}
     :bridge-name               (:processor-name new-path)
     :amount-out                (:amount-out new-path)
     :approval-contract-address (:approval-contract-address new-path)
@@ -275,7 +276,10 @@
     :to                        (:to-chain new-path)
     :approval-amount-required  (:approval-amount-required new-path)
     ;;  :cost () ;; tbd not used on desktop
-     :gas-amount                (:tx-gas-amount new-path)}))
+     :gas-amount                (:tx-gas-amount new-path)
+     :router-input-params-uuid  (:router-input-params-uuid new-path)
+     :tx-fee-mode               (transaction-settings/gas-rate->tx-fee-mode (:tx-gas-fee-mode
+                                                                             new-path))}))

 (defn tokens-never-loaded?
  [db]
@@ -6,10 +6,12 @@
    [status-im.contexts.wallet.common.utils :as utils]
    [status-im.contexts.wallet.common.utils.networks :as network-utils]
    [status-im.contexts.wallet.data-store :as data-store]
+    [status-im.contexts.wallet.send.transaction-settings.core :as transaction-settings]
    [status-im.contexts.wallet.send.utils :as send-utils]
    [status-im.contexts.wallet.sheets.network-selection.view :as network-selection]
    [taoensso.timbre :as log]
    [utils.address]
+    [utils.i18n :as i18n]
    [utils.money :as utils.money]
    [utils.number]
    [utils.re-frame :as rf]
@@ -384,16 +386,100 @@
 (rf/reg-event-fx
 :wallet/set-token-amount-to-send
 (fn [{:keys [db]} [{:keys [amount stack-id start-flow?]}]]
+   {:db (assoc-in db [:wallet :ui :send :amount] amount)
+    :fx [[:dispatch
+          [:wallet/wizard-navigate-forward
+           {:current-screen stack-id
+            :start-flow?    start-flow?
+            :flow-id        :wallet-send-flow}]]]}))
+
+(rf/reg-event-fx
+ :wallet.send/auth-slider-completed
+ (fn [{:keys [db]}]
   (let [last-request-uuid (get-in db [:wallet :ui :send :last-request-uuid])]
-     {:db (-> db
-              (assoc-in [:wallet :ui :send :amount] amount)
-              (update-in [:wallet :ui :send] dissoc :transaction-for-signing))
+     {:db (update-in db [:wallet :ui :send] dissoc :transaction-for-signing)
      :fx [[:dispatch [:wallet/build-transactions-from-route {:request-uuid last-request-uuid}]]
           [:dispatch
-            [:wallet/wizard-navigate-forward
-             {:current-screen stack-id
-              :start-flow?    start-flow?
-              :flow-id        :wallet-send-flow}]]]})))
+            [:wallet.send/set-sign-transactions-callback-fx
+             [:dispatch
+              [:wallet/prepare-signatures-for-transactions :send]]]]]})))
+
+(defn log-transaction-signature-error
+  [error]
+  (log/error
+   "failed to prepare signatures for transactions"
+   {:event :wallet/prepare-signatures-for-transactions
+    :error error})
+  (rf/dispatch
+   [:toasts/upsert
+    {:id   :prepare-signatures-for-transactions-error
+     :type :negative
+     :text (:message error)}]))
+
+(defn- send-transactions-with-signatures
+  [tx-type signatures]
+  (rf/dispatch
+   [:wallet/send-router-transactions-with-signatures tx-type
+    signatures]))
+
+(rf/reg-event-fx
+ :wallet/send-router-transactions-with-signatures
+ (fn [{:keys [db]} [tx-type signatures]]
+   (let [transaction-for-signing (get-in db [:wallet :ui tx-type :transaction-for-signing])
+         signatures-map          (reduce (fn [acc {:keys [message signature]}]
+                                           (assoc acc
+                                                  message
+                                                  (send-utils/signature-rsv signature)))
+                                         {}
+                                         signatures)]
+     {:json-rpc/call [{:method     "wallet_sendRouterTransactionsWithSignatures"
+                       :params     [{:uuid       (get-in transaction-for-signing [:sendDetails :uuid])
+                                     :signatures signatures-map}]
+                       :on-success (fn []
+                                     (rf/dispatch [:hide-bottom-sheet]))
+                       :on-error   (fn [error]
+                                     (log/error "failed to send router transactions with signatures"
+                                                {:event :wallet/send-router-transactions-with-signatures
+                                                 :error error})
+                                     (rf/dispatch [:toasts/upsert
+                                                   {:id   :send-router-transactions-with-signatures-error
+                                                    :type :negative
+                                                    :text (:message error)}]))}]})))
+
+(rf/reg-event-fx
+ :wallet/prepare-signatures-for-transactions
+ (fn [{:keys [db]} [tx-type]]
+   (let [transaction-for-signing                (get-in db
+                                                        [:wallet :ui tx-type :transaction-for-signing])
+         signing-details                        (:signingDetails transaction-for-signing)
+         {:keys [hashes address signOnKeycard]} signing-details
+         send-tx-fn                             (partial send-transactions-with-signatures tx-type)]
+     (if signOnKeycard
+       {:fx [[:dispatch
+              [:standard-auth/authorize-with-keycard
+               {:on-complete (fn [pin]
+                               (rf/dispatch [:keycard/connect-and-sign-hashes
+                                             {:keycard-pin pin
+                                              :address     address
+                                              :hashes      hashes
+                                              :on-success  send-tx-fn
+                                              :on-failure  log-transaction-signature-error}]))}]]]}
+       {:fx [[:dispatch
+              [:standard-auth/authorize
+               {:on-auth-success   (fn [sha3-pwd]
+                                     (rf/dispatch [:wallet/standard-auth-autorization-success hashes
+                                                   address sha3-pwd send-tx-fn]))
+                :auth-button-label (i18n/label :t/confirm)}]]]}))))
+
+(rf/reg-event-fx
+ :wallet/standard-auth-autorization-success
+ (fn [_ [hashes address sha3-pwd send-tx-fn]]
+   {:fx [[:effects.wallet/sign-transaction-hashes
+          {:hashes     hashes
+           :address    address
+           :password   (security/safe-unmask-data sha3-pwd)
+           :on-success send-tx-fn
+           :on-error   log-transaction-signature-error}]]}))

 (rf/reg-event-fx
 :wallet/build-transaction-for-collectible-route
@@ -409,16 +495,14 @@
 (rf/reg-event-fx
 :wallet/set-token-amount-to-bridge
 (fn [{:keys [db]} [{:keys [amount stack-id start-flow?]}]]
-   (let [last-request-uuid (get-in db [:wallet :ui :send :last-request-uuid])]
-     {:db (-> db
-              (assoc-in [:wallet :ui :send :amount] amount)
-              (update-in [:wallet :ui :send] dissoc :transaction-for-signing))
-      :fx [[:dispatch [:wallet/build-transactions-from-route {:request-uuid last-request-uuid}]]
-           [:dispatch
-            [:wallet/wizard-navigate-forward
-             {:current-screen stack-id
-              :start-flow?    start-flow?
-              :flow-id        :wallet-bridge-flow}]]]})))
+   {:db (-> db
+            (assoc-in [:wallet :ui :send :amount] amount)
+            (update-in [:wallet :ui :send] dissoc :transaction-for-signing))
+    :fx [[:dispatch
+          [:wallet/wizard-navigate-forward
+           {:current-screen stack-id
+            :start-flow?    start-flow?
+            :flow-id        :wallet-bridge-flow}]]]}))

 (rf/reg-event-fx
 :wallet/clean-bridge-to-selection
@@ -580,7 +664,10 @@
 :wallet/handle-suggested-routes
 (fn [{:keys [db]} [data]]
   (let [{send :send swap? :swap} (-> db :wallet :ui)
-         skip-processing-routes?  (:skip-processing-suggested-routes? send)]
+         skip-processing-routes?  (:skip-processing-suggested-routes? send)
+         clean-user-tx-settings?  (get-in db
+                                          [:wallet :ui :send :custom-tx-settings
+                                           :delete-on-routes-update?])]
     (when (or swap? (not skip-processing-routes?))
       (let [{error-code :code
              :as        error} (:ErrorResponse data)
@@ -591,13 +678,16 @@
           (log/error "failed to get suggested routes (async)"
                      {:event :wallet/handle-suggested-routes
                       :error error-message}))
-         {:fx [[:dispatch
-                (cond
-                  (and failure? swap?) [:wallet/swap-proposal-error error]
-                  failure?             [:wallet/suggested-routes-error error-message]
-                  swap?                [:wallet/swap-proposal-success (fix-routes data)]
-                  :else                [:wallet/suggested-routes-success (fix-routes data)
-                                        enough-assets?])]]})))))
+         (merge
+          (when clean-user-tx-settings?
+            {:db (update-in db [:wallet :ui :send] dissoc :custom-tx-settings)})
+          {:fx [[:dispatch
+                 (cond
+                   (and failure? swap?) [:wallet/swap-proposal-error error]
+                   failure?             [:wallet/suggested-routes-error error-message]
+                   swap?                [:wallet/swap-proposal-success (fix-routes data)]
+                   :else                [:wallet/suggested-routes-success (fix-routes data)
+                                         enough-assets?])]]}))))))

 (rf/reg-event-fx
 :wallet/transaction-success
@@ -669,66 +759,6 @@
                                                :type :negative
                                                :text (:message error)}]))}]}))

-(rf/reg-event-fx
- :wallet/prepare-signatures-for-transactions
- (fn [{:keys [db]} [type sha3-pwd]]
-   (let [{:keys [hashes address signOnKeycard]} (get-in db
-                                                        [:wallet :ui type :transaction-for-signing
-                                                         :signingDetails])
-         on-success                             (fn [signatures]
-                                                  (rf/dispatch
-                                                   [:wallet/send-router-transactions-with-signatures type
-                                                    signatures]))
-         on-error                               (fn [error]
-                                                  (log/error
-                                                   "failed to prepare signatures for transactions"
-                                                   {:event :wallet/prepare-signatures-for-transactions
-                                                    :error error})
-                                                  (rf/dispatch
-                                                   [:toasts/upsert
-                                                    {:id   :prepare-signatures-for-transactions-error
-                                                     :type :negative
-                                                     :text (:message error)}]))]
-     (if signOnKeycard
-       {:fx [[:dispatch
-              [:standard-auth/authorize-with-keycard
-               {:on-complete #(rf/dispatch [:keycard/connect-and-sign-hashes
-                                            {:keycard-pin %
-                                             :address     address
-                                             :hashes      hashes
-                                             :on-success  on-success
-                                             :on-failure  on-error}])}]]]}
-       {:fx [[:effects.wallet/sign-transaction-hashes
-              {:hashes     hashes
-               :address    address
-               :password   (security/safe-unmask-data sha3-pwd)
-               :on-success on-success
-               :on-error   on-error}]]}))))
-
-(rf/reg-event-fx
- :wallet/send-router-transactions-with-signatures
- (fn [{:keys [db]} [type signatures]]
-   (let [transaction-for-signing (get-in db [:wallet :ui type :transaction-for-signing])
-         signatures-map          (reduce (fn [acc {:keys [message signature]}]
-                                           (assoc acc
-                                                  message
-                                                  (send-utils/signature-rsv signature)))
-                                         {}
-                                         signatures)]
-     {:json-rpc/call [{:method     "wallet_sendRouterTransactionsWithSignatures"
-                       :params     [{:uuid       (get-in transaction-for-signing [:sendDetails :uuid])
-                                     :signatures signatures-map}]
-                       :on-success (fn []
-                                     (rf/dispatch [:hide-bottom-sheet]))
-                       :on-error   (fn [error]
-                                     (log/error "failed to send router transactions with signatures"
-                                                {:event :wallet/send-router-transactions-with-signatures
-                                                 :error error})
-                                     (rf/dispatch [:toasts/upsert
-                                                   {:id   :send-router-transactions-with-signatures-error
-                                                    :type :negative
-                                                    :text (:message error)}]))}]})))
-
 (rf/reg-event-fx
 :wallet/select-from-account
 (fn [{db :db} [{:keys [address stack-id network-details network start-flow?] :as params}]]
@@ -817,35 +847,69 @@
 (rf/reg-event-fx
 :wallet/init-tx-settings
 (fn [{db :db}]
-   {:db (assoc-in db
-         [:wallet :ui :send :tx-settings]
-         {:max-base-fee   {:low     5
-                           :current 8.2
-                           :high    9}
-          :priority-fee   {:low     0.6
-                           :high    5.1
-                           :current 1.1}
-          :max-gas-amount {:low     30000
-                           :current 31000}
-          :nonce          {:last-transaction 21
-                           :current          22}})}))
+   {:db (-> db
+            (assoc-in [:wallet :ui :send :custom-tx-settings]
+                      {:max-base-fee   {:low     5
+                                        :current 8.2
+                                        :high    9}
+                       :priority-fee   {:low     0.6
+                                        :high    5.1
+                                        :current 1.1}
+                       :max-gas-amount {:low     30000
+                                        :current 31000}
+                       :nonce          {:last-transaction 21
+                                        :current          22}}))}))

 (rf/reg-event-fx
 :wallet/set-max-base-fee
 (fn [{db :db} [value]]
-   {:db (assoc-in db [:wallet :ui :send :tx-settings :max-base-fee :current] value)}))
+   {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :max-base-fee :current] value)}))

 (rf/reg-event-fx
 :wallet/set-priority-fee
 (fn [{db :db} [value]]
-   {:db (assoc-in db [:wallet :ui :send :tx-settings :priority-fee :current] value)}))
+   {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :priority-fee :current] value)}))
 (rf/reg-event-fx

 :wallet/set-max-gas-amount
 (fn [{db :db} [value]]
-   {:db (assoc-in db [:wallet :ui :send :tx-settings :max-gas-amount :current] value)}))
+   {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :max-gas-amount :current] value)}))

 (rf/reg-event-fx
 :wallet/set-nonce
 (fn [{db :db} [value]]
   {:db (assoc-in db [:wallet :ui :send :tx-settings :nonce :current] value)}))
+
+(rf/reg-event-fx :wallet/quick-fee-mode-confirmed
+ (fn [{db :db} [fee-mode]]
+   (let [gas-rate         (transaction-settings/tx-fee-mode->gas-rate fee-mode)
+         route            (first (get-in db [:wallet :ui :send :route]))
+         path-tx-identity (send-utils/path-identity route)
+         params           [path-tx-identity gas-rate]]
+     {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :tx-fee-mode] fee-mode)
+      :fx [[:json-rpc/call
+            [{:method   "wallet_setFeeMode"
+              :params   params
+              :on-error (fn [error]
+                          (log/error "failed to set quick transaction settings"
+                                     {:event  :wallet/quick-fee-mode-confirmed
+                                      :error  (:message error)
+                                      :params params}))}]]
+           [:dispatch [:wallet/mark-user-tx-settings-for-deletion]]]})))
+
+
+;; There is a delay between the moment when user selected
+;; custom settings and the moment when new route arrived
+;; with those settings applied. During this delay
+;; we should keep user settings for ui. After new route
+;; arrived we should clean the settings.
+(rf/reg-event-fx :wallet/mark-user-tx-settings-for-deletion
+ (fn [{db :db}]
+   {:db (assoc-in db [:wallet :ui :send :custom-tx-settings :delete-on-routes-update?] true)}))
+
+
+(rf/reg-event-fx :wallet.send/set-sign-transactions-callback-fx
+ (fn [{:keys [db]} [callback-fx]]
+   {:db (assoc-in db
+         [:wallet :ui :send :sign-transactions-callback-fx]
+         callback-fx)}))
@@ -72,11 +72,6 @@

    :else (rf/dispatch [:wallet/stop-and-clean-suggested-routes])))

-(defn- get-fee-formatted
-  [route]
-  (when-let [native-currency-symbol (-> route first :from :native-currency-symbol)]
-    (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol])))
-
 (defn- insufficient-asset-amount?
  [{:keys [token-symbol owned-eth-token input-state limit-exceeded? enough-assets?]}]
  (let [eth-selected?              (= token-symbol (string/upper-case constants/mainnet-short-name))
@@ -172,7 +167,7 @@
                                          (empty? route)
                                          (not valid-input?))
        fee-formatted                 (when (or (not confirm-disabled?) not-enough-asset?)
-                                        (get-fee-formatted route))
+                                        (rf/sub [:wallet/wallet-send-fee-fiat-formatted]))
        handle-on-confirm             (fn [amount]
                                        (rf/dispatch [:wallet/set-token-amount-to-send
                                                      {:amount   amount
@@ -28,3 +28,7 @@
  [theme]
  {:margin-bottom 8
   :color         (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)})
+
+(def summary-container
+  {:padding-horizontal 20
+   :padding-bottom     16})
@@ -5,9 +5,10 @@
    [quo.theme :as quo.theme]
    [react-native.core :as rn]
    [react-native.safe-area :as safe-area]
+    [status-im.common.biometric.utils :as biometric]
    [status-im.common.events-helper :as events-helper]
    [status-im.common.floating-button-page.view :as floating-button-page]
-    [status-im.common.standard-authentication.core :as standard-auth]
+    [status-im.constants :as constants]
    [status-im.contexts.wallet.common.utils :as utils]
    [status-im.contexts.wallet.send.transaction-confirmation.style :as style]
    [status-im.contexts.wallet.send.transaction-settings.view :as transaction-settings]
@@ -134,9 +135,7 @@
                            :saved-address :saved-account
                            :account       :status-account
                            summary-type)]
-    [rn/view
-     {:style {:padding-horizontal 20
-              :padding-bottom     16}}
+    [rn/view {:style style/summary-container}
     [quo/text
      {:size                :paragraph-2
       :weight              :medium
@@ -144,17 +143,32 @@
       :accessibility-label accessibility-label}
      label]
     [quo/summary-info
-      {:type          summary-info-type
-       :networks?     true
-       :values        (send-utils/network-values-for-ui network-values)
-       :account-props (cond-> account-props
-                        (and account-to? (not bridge-tx?))
-                        (assoc
-                         :size                32
-                         :name                (:label recipient)
-                         :full-name           (:label recipient)
-                         :emoji               (:emoji recipient)
-                         :customization-color (:customization-color recipient)))}]]))
+      {:type             summary-info-type
+       :networks-to-show (when bridge-tx?
+                           (send-utils/network-values-for-ui network-values))
+       :account-props    (cond-> account-props
+                           (and account-to? (not bridge-tx?))
+                           (assoc
+                            :size                32
+                            :name                (:label recipient)
+                            :full-name           (:label recipient)
+                            :emoji               (:emoji recipient)
+                            :customization-color (:customization-color recipient)))}]]))
+
+(defn- network-summary
+  [{:keys [theme label accessibility-label]}]
+  (let [network (rf/sub [:wallet/send-selected-network])]
+    (when network
+      [rn/view {:style style/summary-container}
+       [quo/text
+        {:size                :paragraph-2
+         :weight              :medium
+         :style               (style/section-label theme)
+         :accessibility-label accessibility-label}
+        label]
+       [quo/summary-info
+        {:type          :network
+         :network-props network}]])))

 (defn- data-item
  [{:keys [title subtitle]}]
@@ -168,10 +182,9 @@
    :subtitle        subtitle}])

 (defn- transaction-details
-  [{:keys [estimated-time-min max-fees to-network route
-           transaction-type]}]
-  (let [route-loaded?             (and route (seq route))
-        loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
+  [{:keys [estimated-time-min max-fees to-network
+           transaction-type route-loaded?]}]
+  (let [loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
        amount                    (rf/sub [:wallet/send-total-amount-formatted])]
    [rn/view
     {:style (style/details-container
@@ -182,18 +195,17 @@
       [rn/activity-indicator {:style {:flex 1}}]
       route-loaded?
       [:<>
-        (when (ff/enabled? ::ff/wallet.transaction-params)
-          [quo/button
-           {:icon-only?          true
-            :type                :outline
-            :size                32
-            :inner-style         {:opacity 1}
-            :accessibility-label :advanced-button
-            :container-style     {:margin-right 8}
-            :on-press            #(rf/dispatch
-                                   [:show-bottom-sheet
-                                    {:content transaction-settings/settings-sheet}])}
-           :i/advanced])
+        [quo/button
+         {:icon-only?          true
+          :type                :outline
+          :size                32
+          :inner-style         {:opacity 1}
+          :accessibility-label :advanced-button
+          :container-style     {:margin-right 8}
+          :on-press            #(rf/dispatch
+                                 [:show-bottom-sheet
+                                  {:content transaction-settings/settings-sheet}])}
+         :i/advanced]
        [data-item
         {:title    (i18n/label :t/est-time)
          :subtitle (i18n/label :t/time-in-mins {:minutes (str estimated-time-min)})}]
@@ -225,11 +237,7 @@
        estimated-time-min        (reduce + (map :estimated-time route))
        token-symbol              (or token-display-name
                                      (-> send-transaction-data :token :symbol))
-        first-route               (first route)
-        native-currency-symbol    (get-in first-route
-                                          [:from :native-currency-symbol])
-        fee-formatted             (rf/sub [:wallet/wallet-send-fee-fiat-formatted
-                                           native-currency-symbol])
+        fee-formatted             (rf/sub [:wallet/wallet-send-fee-fiat-formatted])
        account                   (rf/sub [:wallet/current-viewing-account])
        account-color             (:color account)
        bridge-to-network         (when bridge-to-chain-id
@@ -237,7 +245,6 @@
                                             bridge-to-chain-id]))
        loading-suggested-routes? (rf/sub
                                   [:wallet/wallet-send-loading-suggested-routes?])
-        transaction-for-signing   (rf/sub [:wallet/wallet-send-transaction-for-signing])
        from-account-props        {:customization-color account-color
                                   :size                32
                                   :emoji               (:emoji account)
@@ -249,20 +256,9 @@
        user-props                {:full-name to-address
                                   :address   (utils/get-shortened-address
                                               to-address)}
-        sign-on-keycard?          (get-in transaction-for-signing
-                                          [:signingDetails :signOnKeycard])]
+        biometric-auth?           (= (rf/sub [:auth-method]) constants/auth-method-biometric)
+        biometric-type            (rf/sub [:biometrics/supported-type])]
    (hot-reload/use-safe-unmount #(rf/dispatch [:wallet/clean-route-data-for-collectible-tx]))
-    ;; In token send flow we already have transaction built when
-    ;; we reach confirmation screen. But in send collectible flow
-    ;; routes request happens at the same time with navigation to
-    ;; confirmation screen. So we need to build the transaction as soon
-    ;; as route is available.
-    (rn/use-effect
-     (fn []
-       (when (and (send-utils/tx-type-collectible? transaction-type)
-                  first-route)
-         (rf/dispatch [:wallet/build-transaction-for-collectible-route])))
-     [first-route])
    (rn/use-mount
     (fn []
       (when (ff/enabled? ::ff/wallet.transaction-params)
@@ -283,27 +279,21 @@
                                    :to-network         bridge-to-network
                                    :theme              theme
                                    :route              route
-                                    :transaction-type   transaction-type}]
+                                    :transaction-type   transaction-type
+                                    :route-loaded?      (and route (seq route))}]
                                  (when (and (not loading-suggested-routes?) route (seq route))
-                                    [standard-auth/slide-button
-                                     {:size :size-48
-                                      :track-text (if (= transaction-type :tx/bridge)
-                                                    (i18n/label :t/slide-to-bridge)
-                                                    (i18n/label :t/slide-to-send))
-                                      :container-style {:z-index 2}
-                                      :disabled? (not transaction-for-signing)
+                                    [quo/slide-button
+                                     {:size                :size-48
+                                      :track-text          (if (= transaction-type :tx/bridge)
+                                                             (i18n/label :t/slide-to-bridge)
+                                                             (i18n/label :t/slide-to-send))
+                                      :container-style     {:z-index 2}
                                      :customization-color account-color
-                                      :auth-button-label (i18n/label :t/confirm)
-                                      :on-complete (when sign-on-keycard?
-                                                     #(rf/dispatch
-                                                       [:wallet/prepare-signatures-for-transactions
-                                                        :send
-                                                        ""]))
-                                      :on-auth-success
-                                      (fn [psw]
-                                        (rf/dispatch
-                                         [:wallet/prepare-signatures-for-transactions :send
-                                          psw]))}])]
+                                      :track-icon          (if biometric-auth?
+                                                             (biometric/get-icon-by-type biometric-type)
+                                                             :password)
+                                      :on-complete         #(rf/dispatch
+                                                             [:wallet.send/auth-slider-completed])}])]
       :gradient-cover?          true
       :customization-color      (:color account)}
      [rn/view
@@ -323,6 +313,7 @@
         :accessibility-label :summary-from-label
         :label               (i18n/label :t/from-capitalized)
         :account-props       from-account-props
+         :bridge-tx?          (= transaction-type :tx/bridge)
         :theme               theme}]
       [user-summary
        {:summary-type        (if (= transaction-type :tx/bridge)
@@ -336,4 +327,8 @@
         :recipient           recipient
         :bridge-tx?          (= transaction-type :tx/bridge)
         :account-to?         true
-         :theme               theme}]]]]))
+         :theme               theme}]
+       (when-not (= transaction-type :tx/bridge)
+         [network-summary
+          {:label (i18n/label :t/on-capitalized)
+           :theme theme}])]]]))
@@ -0,0 +1,23 @@
+(ns status-im.contexts.wallet.send.transaction-settings.core
+  (:require
+    [status-im.constants :as constants]))
+
+(def default-transaction-setting :tx-fee-mode/fast)
+
+(defn tx-fee-mode->gas-rate
+  [tx-fee-mode]
+  (case tx-fee-mode
+    :tx-fee-mode/normal constants/gas-rate-low
+    :tx-fee-mode/fast   constants/gas-rate-medium
+    :tx-fee-mode/urgent constants/gas-rate-high
+    :tx-fee-mode/custom constants/gas-rate-custom
+    constants/gas-rate-medium))
+
+(defn gas-rate->tx-fee-mode
+  [gas-rate]
+  (condp = gas-rate
+    constants/gas-rate-low    :tx-fee-mode/normal
+    constants/gas-rate-medium :tx-fee-mode/fast
+    constants/gas-rate-high   :tx-fee-mode/urgent
+    constants/gas-rate-custom :tx-fee-mode/custom
+    :tx-fee-mode/fast))
@@ -5,6 +5,7 @@
    [react-native.platform :as platform]
    [react-native.safe-area :as safe-area]
    [status-im.common.controlled-input.utils :as controlled-input]
+    [status-im.feature-flags :as ff]
    [utils.i18n :as i18n]
    [utils.re-frame :as rf]))

@@ -14,7 +15,8 @@
  (let [max-base-fee   (:current (rf/sub [:wallet/tx-settings-max-base-fee]))
        priority-fee   (:current (rf/sub [:wallet/tx-settings-priority-fee]))
        max-gas-amount (:current (rf/sub [:wallet/tx-settings-max-gas-amount]))
-        nonce          (:current (rf/sub [:wallet/tx-settings-nonce]))]
+        nonce          (:current (rf/sub [:wallet/tx-settings-nonce]))
+        account-color  (rf/sub [:wallet/current-viewing-account-color])]
    [rn/view
     [quo/drawer-top
      {:title (i18n/label :t/custom)}]
@@ -62,64 +64,90 @@
                    :preview-size      :size-32}]}]
     [quo/bottom-actions
      {:actions          :one-action
-       :button-one-props {:on-press #(rf/dispatch [:hide-bottom-sheet])}
+       :button-one-props {:on-press            #(rf/dispatch [:hide-bottom-sheet])
+                          :customization-color account-color}
       :button-one-label (i18n/label :t/confirm)}]]))

 (defn settings-sheet
-  [_]
-  (let [[selected-id set-selected-id] (rn/use-state :normal)]
+  []
+  (let [current-transaction-setting                   (rf/sub [:wallet/tx-fee-mode])
+        account-color                                 (rf/sub [:wallet/current-viewing-account-color])
+        [transaction-setting set-transaction-setting] (rn/use-state current-transaction-setting)
+        set-normal                                    #(set-transaction-setting :tx-fee-mode/normal)
+        set-fast                                      #(set-transaction-setting :tx-fee-mode/fast)
+        set-urgent                                    #(set-transaction-setting :tx-fee-mode/urgent)]
    [rn/view
     [quo/drawer-top
      {:title (i18n/label :t/transaction-settings)}]
     [quo/category
      {:list-type :settings
-       :data      [{:title             (str (i18n/label :t/normal) "~60s")
-                    :image-props       "🍿"
-                    :description-props {:text "€1.45"}
-                    :image             :emoji
-                    :description       :text
-                    :action            :selector
-                    :action-props      {:type     :radio
-                                        :checked? (= :normal selected-id)}
-                    :on-press          #(set-selected-id :normal)
-                    :label             :text
-                    :preview-size      :size-32}
-                   {:title             (str (i18n/label :t/fast) "~40s")
-                    :image-props       "🚗"
-                    :description-props {:text "€1.65"}
-                    :image             :emoji
-                    :description       :text
-                    :action            :selector
-                    :action-props      {:type     :radio
-                                        :checked? (= :fast selected-id)}
-                    :on-press          #(set-selected-id :fast)
-                    :label             :text
-                    :preview-size      :size-32}
-                   {:title             (str (i18n/label :t/urgent) "~15s")
-                    :image-props       "🚀"
-                    :description-props {:text "€1.85"}
-                    :image             :emoji
-                    :description       :text
-                    :action            :selector
-                    :action-props      {:type     :radio
-                                        :checked? (= :urgent selected-id)}
-                    :on-press          #(set-selected-id :urgent)
-                    :label             :text
-                    :preview-size      :size-32}
-                   {:title             (i18n/label :t/custom)
-                    :image-props       :i/edit
-                    :description-props {:text "Set your own fees and nonce"}
-                    :image             :icon
-                    :description       :text
-                    :action            :arrow
-                    :on-press          #(rf/dispatch
-                                         [:show-bottom-sheet
-                                          {:content custom-settings-sheet}])
-                    :label             :text
-                    :preview-size      :size-32}]}]
+       :data [{:title             (str (i18n/label :t/normal) "~60s")
+               :image-props       "🍿"
+               :description-props {:text (rf/sub [:wallet/wallet-send-transaction-setting-fiat-formatted
+                                                  :tx-fee-mode/normal])}
+               :image             :emoji
+               :description       :text
+               :action            :selector
+               :action-props      {:type                :radio
+                                   :checked?            (= :tx-fee-mode/normal transaction-setting)
+                                   :customization-color account-color
+                                   ;; there is an UI isssue in quo/category, it has :on-press event
+                                   ;; and child radio button has own :on-change. If they are not set
+                                   ;; to the same action then we are getting inconsistent behaviour
+                                   ;; when user can click on settings item but cant on radio itself.
+                                   ;; So duplication is to prevent that until general fix is applied
+                                   ;; to quo/category
+                                   :on-change           set-normal}
+               :on-press          set-normal
+               :label             :text
+               :preview-size      :size-32}
+              {:title             (str (i18n/label :t/fast) "~40s")
+               :image-props       "🚗"
+               :description-props {:text (rf/sub [:wallet/wallet-send-transaction-setting-fiat-formatted
+                                                  :tx-fee-mode/fast])}
+               :image             :emoji
+               :description       :text
+               :action            :selector
+               :action-props      {:type                :radio
+                                   :checked?            (= :tx-fee-mode/fast transaction-setting)
+                                   :on-change           set-fast
+                                   :customization-color account-color}
+               :on-press          set-fast
+               :label             :text
+               :preview-size      :size-32}
+              {:title             (str (i18n/label :t/urgent) "~15s")
+               :image-props       "🚀"
+               :description-props {:text (rf/sub [:wallet/wallet-send-transaction-setting-fiat-formatted
+                                                  :tx-fee-mode/urgent])}
+               :image             :emoji
+               :description       :text
+               :action            :selector
+               :action-props      {:type                :radio
+                                   :checked?            (= :tx-fee-mode/urgent transaction-setting)
+                                   :customization-color account-color
+                                   :on-change           set-urgent}
+               :on-press          set-urgent
+               :label             :text
+               :preview-size      :size-32}
+              (when (ff/enabled? ::ff/wallet.transaction-params)
+                {:title             (i18n/label :t/custom)
+                 :image-props       :i/edit
+                 :description-props {:text "Set your own fees and nonce"}
+                 :image             :icon
+                 :description       :text
+                 :action            :arrow
+                 :on-press          #(rf/dispatch
+                                      [:show-bottom-sheet
+                                       {:content custom-settings-sheet}])
+                 :label             :text
+                 :preview-size      :size-32})]}]
     [quo/bottom-actions
      {:actions          :one-action
-       :button-one-props {:on-press #(rf/dispatch [:hide-bottom-sheet])}
+       :button-one-props {:on-press            (fn []
+                                                 (rf/dispatch [:wallet/quick-fee-mode-confirmed
+                                                               transaction-setting])
+                                                 (rf/dispatch [:hide-bottom-sheet]))
+                          :customization-color account-color}
       :button-one-label (i18n/label :t/confirm)}]]))

 (defn- hint
@@ -25,21 +25,42 @@
             transaction-hashes))

 (defn calculate-gas-fee
-  [data]
-  (let [gas-amount         (money/bignumber (get data :gas-amount))
-        gas-fees           (get data :gas-fees)
-        eip1559-enabled?   (get gas-fees :eip-1559-enabled)
-        optimal-price-gwei (money/bignumber (if eip1559-enabled?
-                                              (get gas-fees :max-fee-per-gas-medium)
-                                              (get gas-fees :gas-price)))
-        total-gas-fee-wei  (money/mul (money/->wei :gwei optimal-price-gwei) gas-amount)
-        l1-fee-wei         (money/->wei :gwei (get gas-fees :l-1-gas-fee))]
+  [{:keys [gas-amount gas-price l1-gas-fee]}]
+  (let [total-gas-fee-wei (money/mul (money/->wei :gwei gas-price) gas-amount)
+        l1-fee-wei        (money/->wei :gwei l1-gas-fee)]
    (money/add total-gas-fee-wei l1-fee-wei)))

-(defn calculate-full-route-gas-fee
+(defn path-gas-fee
+  [path]
+  (let [gas-amount       (money/bignumber (get path :gas-amount))
+        gas-fees         (get path :gas-fees)
+        eip1559-enabled? (get gas-fees :eip-1559-enabled)
+        gas-price        (money/bignumber (if eip1559-enabled?
+                                            (get gas-fees :tx-max-fees-per-gas)
+                                            (get gas-fees :gas-price)))
+        l1-gas-fee       (get gas-fees :l-1-gas-fee)]
+    (calculate-gas-fee {:gas-amount gas-amount
+                        :gas-price  gas-price
+                        :l1-gas-fee l1-gas-fee})))
+
+(defn path-gas-fee-for-custom-gas-price
+  [route gas-price]
+  (let [gas-amount (money/bignumber (get route :gas-amount))
+        gas-fees   (get route :gas-fees)
+        l1-gas-fee (get gas-fees :l-1-gas-fee)]
+    (calculate-gas-fee {:gas-amount gas-amount
+                        :gas-price  (money/bignumber gas-price)
+                        :l1-gas-fee l1-gas-fee})))
+
+(defn full-route-gas-fee
  "Sums all the routes fees in wei and then convert the total value to ether"
  [route]
-  (money/wei->ether (reduce money/add (map calculate-gas-fee route))))
+  (money/wei->ether (reduce money/add (map path-gas-fee route))))
+
+(defn full-route-gas-fee-for-custom-gas-price
+  "Sums all the routes fees in wei and then convert the total value to ether"
+  [route gas-price]
+  (money/wei->ether (reduce money/add (map #(path-gas-fee-for-custom-gas-price % gas-price) route))))

 (defn- path-amount-in
  [path]
@@ -224,3 +245,11 @@
  {:r (subs signature 0 64)
   :s (subs signature 64 128)
   :v (subs signature 128 130)})
+
+(defn path-identity
+  [path]
+  {:routerInputParamsUuid (:router-input-params-uuid path)
+   :pathName              (:bridge-name path)
+   :chainID               (get-in path [:from :chain-id])
+   :isApprovalTx          (:approval-required path)
+   :communityID           nil})
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Volodymyr Kozieiev	eec5e9c629	Added log level `error` as requested by @qfrank	2025-02-27 11:32:37 +00:00
Volodymyr Kozieiev	446085b4cf	disable logging	2025-02-27 11:26:46 +00:00
Volodymyr Kozieiev	b2602ba15e	_TEMPORARY_ enabled all logging in release for testing purposes (#22192 )	2025-02-26 11:36:41 +00:00
Volodymyr Kozieiev	4b0a983d68	swtiched to status-go version v10.7.0 https://github.com/status-im/status-go/compare/c5e4eb1a...6935cf11	2025-02-26 10:35:02 +00:00
Volodymyr Kozieiev	af5c613cc0	Bump version to 2.33.0	2025-02-26 09:34:52 +00:00
AlexanderandYevheniia Berdnyk	550602db12	Update send summary to show network in a separate card (#21616 ) (#22067 ) * Update send summary to show network in a separate card (#21616) * Style updates * Style updates * Fixes; test updates * Fixes * Fixes * e2e: updated send summary checks * Spec fix * Spec fix * Small schema update --------- Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com>	2025-02-25 16:20:17 +01:00
Parvesh Monu	5932f7dc99	Fix keycard login flow options while using empty keycard (#22182 )	2025-02-25 17:58:48 +05:30
Icaro Motta	b89dce3c2a	chore(analytics): Integrate Sentry (#21682 ) Integrate Sentry and implement a feature flagged feature (disabled by default) to force crash the app using the function mobile/status.go#IntendedPanic() provided by status-go. Because the feature is feature flagged and disabled, it is not available in release builds. Fixes: https://github.com/status-im/status-mobile/issues/21656 Documentation about Sentry in status-go: https://github.com/status-im/status-go/blob/3466ac2661bb19cd0eaa27761551de3b4d31b393/internal/sentry/README.md#L60 Areas that may be impacted: Whenever a panic happens in status-go and usage data collection is enabled we will send error data to Sentry. In theory, nothing should change for the user, therefore nothing should be visibly different in the app's behavior. Steps to test: Before following the steps below, the CI must be configured with the appropriate SENTRY_DSN_STATUS_GO value. You can also use a free tier cloud instance to do your own testing in case you want to play around with Sentry. 1. Login with any profile. 2. Enable usage data collection (for now, Sentry and analytics are tied to the same setting in status-go). 3. Go to Settings > Feature flags and enable app-monitoring > intentional-crash 4. Go to Settings > Advanced > and press on Force crash immediately Usually you should see the error in the Sentry dashboard in a matter of seconds.	2025-02-24 19:28:38 -03:00
Parvesh Monu	8aba451be8	Update keycard Illustrations (#22171 )	2025-02-24 20:00:39 +05:30
Icaro Motta	82dd805755	chore(analytics): Allow MixPanel to be configured per env (#21975 ) Allows MixPanel to be configured per environment. The hardcoded MixPanel app ID and token are removed from the code (see the parent issue for more details). The token can be exploited and that’s by design in most analytics tools https://developer.mixpanel.com/reference/project-token. Fixes https://github.com/status-im/status-mobile/issues/21974 Areas that may be impacted - Analytics	2025-02-24 00:06:59 -03:00
Ulises Manuel	6e30d9faa8	fix(communities): Add missing stats (#22143 ) * fix(communities): Stats not shown in discover page * fix issues in the discover screen related to the theme	2025-02-21 08:40:18 -06:00
Mohsen	070869b705	[#21999 ] fix: disable manual auto refresh as new endpoint include auto refresh (#22115 ) * [#21999] fix: disable manual auto refresh as new endpoint include this logic * [#21999] fix: move build transaction route to last step * [#21999] fix: restart swap proposal fetch after approval confirmation * [#21999] fix: remove redundant event * [#21999] fix: resolve conflicts * [#21999] fix: slide button disable issue	2025-02-21 16:39:15 +03:00
frank	9dfa1069e5	feat_: add pre login log (#21987 ) * feat_: add pre login log https://github.com/status-im/status-go/compare/1bfb0cef...7ae58a47 * fix_: pre_login log not get zipped https://github.com/status-im/status-go/compare/1bfb0cef...c5e4eb1a	2025-02-21 18:42:23 +08:00
Volodymyr Kozieiev	99dd374c87	Quick transaction settings (#22019 ) * Quick settings for sending transaction * Moved to newer status-go, fixed mode saving https://github.com/status-im/status-go/compare/b2cd7bd8...4b44d6d0 * Fixed non-pressable radio buttons * Account color applied to controls * Updated status-go version https://github.com/status-im/status-go/compare/1bfb0cef...5a796959 * Fixed bug with not applying bridge quick tx setting	2025-02-21 09:46:31 +00:00
Siddarth Kumar	bac5ace90a	deps: dynamically get gradle-lint version This commit generates the gradle-lint dependency version according to the rules specified here in hack script : https://googlesamples.github.io/android-custom-lint-rules/api-guide.html	2025-02-21 11:32:03 +05:30
Yevheniia Berdnyk	34cb7d19e2	e2e: added tests for collectibles	2025-02-21 01:24:44 +02:00
@@ -1 +1 @@
 .32.0
 .33.0