fix(wallet)_: Address or ENS - Paste button behaviour

Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>
feat(wallet)_: Add base chain indicator (#22215 )
2025-03-04 17:32:03 +05:30 · 2025-03-03 20:24:22 +00:00 · 2025-03-03 22:54:25 +05:30 · 2025-03-03 10:46:40 +00:00 · 2025-03-03 10:28:20 +00:00 · 2025-02-28 14:54:17 +00:00
13 changed files with 58 additions and 48 deletions
@@ -2,7 +2,7 @@ DEBUG_WEBVIEW=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=error
+LOG_LEVEL=debug
 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=0
+API_LOGGING_ENABLED=1
 SENTRY_ENABLED=1
 SENTRY_ENVIRONMENT=production
@@ -1 +1 @@
-2.32.0
+2.33.0
@@ -109,19 +109,10 @@ pipeline {
    stage('Upload') {
      steps { script {
        sshagent(credentials: ['nix-cache-ssh']) {
-          nix.shell(
-            """
+          nix.shell("""
              find /nix/store/ -mindepth 1 -maxdepth 1 -type d \
-                -not -name "*.links" -and -not -name "*-status-mobile-*" \
-                -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
+                -not -name '*.links' -and -not -name '*-status-mobile-*' \
+                | xargs nix copy --to ${NIX_SSH_REMOTE}
            """,
            pure: false
          )
@@ -1,15 +1,15 @@
 (ns quo.components.buttons.slide-button.constants)

-(def track-padding 4)
-
-(def small-dimensions
+(def ^:constant small-dimensions
  {:track-height 40
   :thumb        32})

-(def large-dimensions
+(def ^:constant large-dimensions
  {:track-height 48
   :thumb        40})

-(def disable-opacity 0.3)
+(def ^:constant track-padding 4)
+(def ^:constant disable-opacity 0.3)
+(def ^:constant default-width 300)

-(def default-width 300)
+(def ^:constant reset-timeout-ms 500)
@@ -27,7 +27,8 @@
                             (when (and reached-end? (not sliding-complete?))
                               (set-sliding-complete true)
                               (when on-complete
-                                 (on-complete reset-fn))))))
+                                 (js/setTimeout reset-fn constants/reset-timeout-ms)
+                                 (on-complete))))))
      (gesture/on-end (fn [event]
                        (let [x-translation (oops/oget event "translationX")
                              reached-end?  (>= x-translation track-width)]
@@ -55,10 +56,9 @@
        on-track-layout               (rn/use-callback
                                       #(set-track-width (oops/oget % "nativeEvent.layout.width")))
        reset-fn                      (rn/use-callback
-                                       (fn [keep-at-end-after-slide?]
+                                       (fn []
                                         (set-sliding-complete false)
-                                         (when-not keep-at-end-after-slide?
-                                           (animations/reset-track-position x-pos))))
+                                         (animations/reset-track-position x-pos)))
        dimensions                    (rn/use-callback
                                       (partial utils/get-dimensions
                                                (or track-width constants/default-width)
@@ -26,8 +26,7 @@
                                               :auth-button-label     auth-button-label}]))
                              (vec (conj dependencies on-auth-success on-auth-fail)))
        on-slider-complete   (rn/use-callback
-                              (fn [reset-slider-fn]
-                                (js/setTimeout #(reset-slider-fn false) 500)
+                              (fn []
                                (if (fn? on-complete)
                                  (on-complete)
                                  (on-complete-callback)))
@@ -18,11 +18,16 @@
               :padding-horizontal 36
               :padding-vertical   30
               :background-color   (colors/theme-colors colors/white colors/neutral-95 theme)}}
-      [rn/text {:style {:font-size 26 :color "#9F9FA5" :margin-bottom 36}}
+      [rn/text
+       {:style {:font-size     26
+                :color         (colors/theme-colors "#8F8E94" "#9F9FA5" theme)
+                :margin-bottom 36}}
       (i18n/label :t/ready-to-scan)]
-      [rn/image
-       {:source (resources/get-image :nfc-prompt)}]
-      [rn/text {:style {:font-size 16 :color :white :margin-vertical 36}}
+      [rn/image {:source (resources/get-image :nfc-prompt)}]
+      [rn/text
+       {:style {:font-size       16
+                :color           (colors/theme-colors "#09101C" :white theme)
+                :margin-vertical 36}}
       (if connected?
         (i18n/label :t/connected-dont-move)
         (i18n/label :t/hold-phone-near-keycard))]
@@ -32,6 +37,12 @@
                    (rf/dispatch [:keycard/hide-connection-sheet]))
        :style    {:flex-direction :row}}
       [rn/view
-        {:style {:background-color "#8E8E93" :flex 1 :align-items :center :padding 18 :border-radius 10}}
-        [rn/text {:style {:color :white :font-size 16}}
+        {: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}}
         (i18n/label :t/cancel)]]]]]))
@@ -7,6 +7,7 @@
    [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]
@@ -159,7 +160,7 @@
                                               (fn [clipboard-text]
                                                 (when-not (string/blank? clipboard-text)
                                                   (-> clipboard-text
-                                                       utils-address/extract-address-without-chains-info
+                                                       utils/on-paste-address-or-ens
                                                       on-change-text)))))
        on-press-continue                   (rn/use-callback
                                             (fn []
@@ -7,6 +7,7 @@
    [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]
@@ -42,7 +43,7 @@
        paste-on-input  #(clipboard/get-string
                          (fn [clipboard-text]
                            (-> clipboard-text
-                                utils.address/extract-address-without-chains-info
+                                utils/on-paste-address-or-ens
                                on-change-text)))]
    (rn/use-effect (fn []
                     (when-not (string/blank? scanned-address)
@@ -4,6 +4,7 @@
            [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]))
@@ -479,3 +480,11 @@
      (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))
@@ -61,7 +61,7 @@
                                  (fn [clipboard]
                                    (when-not (empty? clipboard)
                                      (-> clipboard
-                                          utils-address/extract-address-without-chains-info
+                                          utils/on-paste-address-or-ens
                                          on-change)))))
        :ens-regex             constants/regx-ens
        :scanned-value         (or (when recipient-plain-address? send-address) scanned-address)
@@ -249,15 +249,13 @@

 (rf/reg-event-fx :wallet/stop-get-swap-proposal
 (fn [{:keys [db]}]
-   (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}))}]}))))
+   {: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
@@ -3,7 +3,7 @@
    "_comment": "Instead use: scripts/update-status-go.sh <rev>",
    "owner": "status-im",
    "repo": "status-go",
-    "version": "v10.8.0",
-    "commit-sha1": "ba8fd51958686aea45e34e684ac925a4e65927f8",
-    "src-sha256": "0kqn5rkfsn7aqc2n2flqvkm6cc53ssk0mc1l84f4czg0paci0717"
+    "version": "v10.7.0+hotfix.2",
+    "commit-sha1": "595dc68e9ff5e6e57364818098616a97b83eabd5",
+    "src-sha256": "04dsmz70h3i738bj3i3ba8bckpw61vxb56m8sc4qw8agc9pdaxc0"
 }
Author	SHA1	Message	Date
Mohamed Javid	73d5cb24f8	fix(wallet)_: Address or ENS - Paste button behaviour Signed-off-by: Mohamed Javid <19339952+smohamedjavid@users.noreply.github.com>	2025-03-04 17:32:03 +05:30
Mohamed JavidandYevheniia Berdnyk	614eeafde9	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>	2025-03-03 20:24:22 +00:00
Parvesh Monu	1dc4ea3a51	fix Some of the message longtap options disappear until relogin after unmuting chat (#22220 )	2025-03-03 22:54:25 +05:30
Lungu Cristian jakub frank	dbef1c9edc	Fix slide-button not resetting (#22210 ) * nix: use openjdk_headless to avoid pulling GTK This saves a whole bunch of downloading. Signed-off-by: Jakub Sokołowski <jakub@status.im> * fix_: no log file (#22122) * fix_: no log file https://github.com/status-im/status-go/compare/c5e4eb1a...388fce10 * chore_: fix lint issue * chore_: set error level for release build https://github.com/status-im/status-go/compare/c5e4eb1a...ba8fd519 * nix: replace yet another openjdk with headless version Signed-off-by: Jakub Sokołowski <jakub@status.im> * fix: moved slide-button reset from standard-auth to quo --------- Signed-off-by: Jakub Sokołowski <jakub@status.im> Co-authored-by: Jakub Sokołowski <jakub@status.im> Co-authored-by: frank <lovefree103@gmail.com>	2025-03-03 10:46:40 +00:00
Mohsen	4853cde20b	[#22206 ] fix: swap proposal keep sending update either after clean up (#22212 )	2025-03-03 10:28:20 +00:00
Volodymyr Kozieiev	4c5f3282c4	Incorporated latest changes in status-go release branch https://github.com/status-im/status-go/compare/c5e4eb1a...595dc68e	2025-02-28 14:54:17 +00:00
frank	376493b0b3	fix_: no log file (#22201 )	2025-02-27 14:33:24 +00:00
Ulises Manuel	886f7b43d1	fix(keycard): light theme on "ready to scan" sheet (#22196 )	2025-02-27 13:39:34 +00:00
Volodymyr Kozieiev	c8c785f136	Switched to udpated release status-go branch. Log-related changes. https://github.com/status-im/status-go/compare/c5e4eb1a...927f0c2b	2025-02-27 12:20:24 +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
@@ -1 +1 @@
 .32.0
 .33.0