feat(wallet)_: Add base chain indicator (#22215)

* feat(wallet)_: Add base chain indicator

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>

* e2e: updated Base network name

---------

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
Co-authored-by: Yevheniia Berdnyk <ie.berdnyk@gmail.com>

.env.release

@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=debug
+LOG_LEVEL=error
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -20,6 +20,6 @@ FAST_CREATE_COMMUNITY_ENABLED=0
 TEST_NETWORKS_ENABLED=0
 STATUS_PROXY_STAGE_NAME=prod
 FLAG_WALLET_CONNECT_ENABLED=1
-API_LOGGING_ENABLED=1
+API_LOGGING_ENABLED=0
 SENTRY_ENABLED=1
 SENTRY_ENVIRONMENT=production

VERSION

@@ -1 +1 @@
-2.33.0
+2.32.0

ci/tools/Jenkinsfile.nix-cache

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

src/quo/components/buttons/slide_button/constants.cljs

@@ -1,15 +1,15 @@
 (ns quo.components.buttons.slide-button.constants)
 
-(def ^:constant small-dimensions
+(def track-padding 4)
+
+(def small-dimensions
   {:track-height 40
    :thumb        32})
 
-(def ^:constant large-dimensions
+(def large-dimensions
   {:track-height 48
    :thumb        40})
 
-(def ^:constant track-padding 4)
-(def ^:constant disable-opacity 0.3)
-(def ^:constant default-width 300)
+(def disable-opacity 0.3)
 
-(def ^:constant reset-timeout-ms 500)
+(def default-width 300)

src/quo/components/buttons/slide_button/view.cljs

@@ -27,8 +27,7 @@
                              (when (and reached-end? (not sliding-complete?))
                                (set-sliding-complete true)
                                (when on-complete
-                                 (js/setTimeout reset-fn constants/reset-timeout-ms)
-                                 (on-complete))))))
+                                 (on-complete reset-fn))))))
       (gesture/on-end (fn [event]
                         (let [x-translation (oops/oget event "translationX")
                               reached-end?  (>= x-translation track-width)]
@@ -56,9 +55,10 @@
         on-track-layout               (rn/use-callback
                                        #(set-track-width (oops/oget % "nativeEvent.layout.width")))
         reset-fn                      (rn/use-callback
-                                       (fn []
+                                       (fn [keep-at-end-after-slide?]
                                          (set-sliding-complete false)
-                                         (animations/reset-track-position x-pos)))
+                                         (when-not keep-at-end-after-slide?
+                                           (animations/reset-track-position x-pos))))
         dimensions                    (rn/use-callback
                                        (partial utils/get-dimensions
                                                 (or track-width constants/default-width)

src/status_im/common/standard_authentication/standard_auth/slide_button/view.cljs

@@ -26,7 +26,8 @@
                                                :auth-button-label     auth-button-label}]))
                               (vec (conj dependencies on-auth-success on-auth-fail)))
         on-slider-complete   (rn/use-callback
-                              (fn []
+                              (fn [reset-slider-fn]
+                                (js/setTimeout #(reset-slider-fn false) 500)
                                 (if (fn? on-complete)
                                   (on-complete)
                                   (on-complete-callback)))

src/status_im/contexts/keycard/nfc/sheets/view.cljs

@@ -18,16 +18,11 @@
                :padding-horizontal 36
                :padding-vertical   30
                :background-color   (colors/theme-colors colors/white colors/neutral-95 theme)}}
-      [rn/text
-       {:style {:font-size     26
-                :color         (colors/theme-colors "#8F8E94" "#9F9FA5" theme)
-                :margin-bottom 36}}
+      [rn/text {:style {:font-size 26 :color "#9F9FA5" :margin-bottom 36}}
        (i18n/label :t/ready-to-scan)]
-      [rn/image {:source (resources/get-image :nfc-prompt)}]
-      [rn/text
-       {:style {:font-size       16
-                :color           (colors/theme-colors "#09101C" :white theme)
-                :margin-vertical 36}}
+      [rn/image
+       {:source (resources/get-image :nfc-prompt)}]
+      [rn/text {:style {:font-size 16 :color :white :margin-vertical 36}}
        (if connected?
          (i18n/label :t/connected-dont-move)
          (i18n/label :t/hold-phone-near-keycard))]
@@ -37,12 +32,6 @@
                     (rf/dispatch [:keycard/hide-connection-sheet]))
         :style    {:flex-direction :row}}
        [rn/view
-        {:style {:background-color (colors/theme-colors "#D5D4DB" "#8E8E93" theme)
-                 :flex             1
-                 :align-items      :center
-                 :padding          18
-                 :border-radius    10}}
-        [rn/text
-         {:style {:color     (colors/theme-colors "#09101C" :white theme)
-                  :font-size 16}}
+        {:style {:background-color "#8E8E93" :flex 1 :align-items :center :padding 18 :border-radius 10}}
+        [rn/text {:style {:color :white :font-size 16}}
          (i18n/label :t/cancel)]]]]]))

src/status_im/contexts/settings/wallet/saved_addresses/add_address_to_save/view.cljs

@@ -7,7 +7,6 @@
     [react-native.safe-area :as safe-area]
     [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.contexts.settings.wallet.saved-addresses.add-address-to-save.style :as style]
-    [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.common.validation :as validation]
     [utils.address :as utils-address]
     [utils.debounce :as debounce]
@@ -160,7 +159,7 @@
                                                (fn [clipboard-text]
                                                  (when-not (string/blank? clipboard-text)
                                                    (-> clipboard-text
-                                                       utils/on-paste-address-or-ens
+                                                       utils-address/extract-address-without-chains-info
                                                        on-change-text)))))
         on-press-continue                   (rn/use-callback
                                              (fn []

src/status_im/contexts/wallet/add_account/add_address_to_watch/view.cljs

@@ -7,7 +7,6 @@
     [reagent.core :as reagent]
     [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.contexts.wallet.add-account.add-address-to-watch.style :as style]
-    [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.common.validation :as validation]
     [status-im.subs.wallet.add-account.address-to-watch]
     [utils.address :as utils-address]
@@ -43,7 +42,7 @@
         paste-on-input  #(clipboard/get-string
                           (fn [clipboard-text]
                             (-> clipboard-text
-                                utils/on-paste-address-or-ens
+                                utils.address/extract-address-without-chains-info
                                 on-change-text)))]
     (rn/use-effect (fn []
                      (when-not (string/blank? scanned-address)

src/status_im/contexts/wallet/common/utils.cljs

@@ -4,7 +4,6 @@
             [status-im.common.qr-codes.view :as qr-codes]
             [status-im.constants :as constants]
             [status-im.contexts.wallet.common.utils.networks :as network-utils]
-            [utils.address]
             [utils.money :as money]
             [utils.number :as number]
             [utils.string]))
@@ -480,11 +479,3 @@
       (filter (fn [{:keys [tokens]}]
                 (some positive-balance-in-any-chain? tokens))
               operable-account))))
-
-(defn on-paste-address-or-ens
-  "Check if the clipboard has any valid address and extract the address without any chain info.
-  If it does not contain an valid address or it is ENS, return the clipboard text as it is"
-  [clipboard-text]
-  (if (utils.address/supported-address? clipboard-text)
-    (utils.address/extract-address-without-chains-info clipboard-text)
-    clipboard-text))

src/status_im/contexts/wallet/send/select_address/view.cljs

@@ -61,7 +61,7 @@
                                   (fn [clipboard]
                                     (when-not (empty? clipboard)
                                       (-> clipboard
-                                          utils/on-paste-address-or-ens
+                                          utils-address/extract-address-without-chains-info
                                           on-change)))))
         :ens-regex             constants/regx-ens
         :scanned-value         (or (when recipient-plain-address? send-address) scanned-address)

src/status_im/contexts/wallet/swap/events.cljs

@@ -249,13 +249,15 @@
 
 (rf/reg-event-fx :wallet/stop-get-swap-proposal
  (fn [{:keys [db]}]
-   {:db            (update-in db [:wallet :ui :swap] dissoc :last-request-uuid)
-    :json-rpc/call [{:method   "wallet_stopSuggestedRoutesAsyncCalculation"
-                     :params   []
-                     :on-error (fn [error]
-                                 (log/error "failed to stop fetching swap proposals"
-                                            {:event :wallet/stop-get-swap-proposal
-                                             :error error}))}]}))
+   (let [route-request-ongoing? (some? (get-in db [:wallet :ui :swap :last-request-uuid]))]
+     (when route-request-ongoing?
+       {:db            (update-in db [:wallet :ui :swap] dissoc :last-request-uuid)
+        :json-rpc/call [{:method   "wallet_stopSuggestedRoutesAsyncCalculation"
+                         :params   []
+                         :on-error (fn [error]
+                                     (log/error "failed to stop fetching swap proposals"
+                                                {:event :wallet/stop-get-swap-proposal
+                                                 :error error}))}]}))))
 
 (rf/reg-event-fx
  :wallet/clean-swap-proposal

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v10.7.0+hotfix.2",
-    "commit-sha1": "595dc68e9ff5e6e57364818098616a97b83eabd5",
-    "src-sha256": "04dsmz70h3i738bj3i3ba8bckpw61vxb56m8sc4qw8agc9pdaxc0"
+    "version": "v10.8.0",
+    "commit-sha1": "ba8fd51958686aea45e34e684ac925a4e65927f8",
+    "src-sha256": "0kqn5rkfsn7aqc2n2flqvkm6cc53ssk0mc1l84f4czg0paci0717"
 }