fix: dont dismiss modal on drag down

This commit:

- prevents the user from saving their wallet address as the saved address
- fixes button not capturing taps when the keyboard is open in saved address flows

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

src/react_native/wallet_connect.cljs

@@ -51,9 +51,10 @@
 
 (defn reject-session
   [{:keys [web3-wallet id reason]}]
-  (.rejectSession web3-wallet
-                  (clj->js {:id     id
-                            :reason reason})))
+  (oops/ocall web3-wallet
+              "rejectSession"
+              (bean/->js {:id     id
+                          :reason reason})))
 
 (defn approve-session
   [{:keys [web3-wallet id approved-namespaces]}]

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

@@ -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.debounce :as debounce]
     [utils.i18n :as i18n]
@@ -18,20 +19,21 @@
 
 (defn- validate-input
   [account-addresses saved-addresses user-input]
-  (cond
-    (string/blank? user-input)
-    nil
+  (let [[_ address-without-prefix] (utils/split-prefix-and-address user-input)]
+    (cond
+      (string/blank? user-input)
+      nil
 
-    (contains? saved-addresses user-input)
-    :existing-saved-address
+      (contains? saved-addresses address-without-prefix)
+      :existing-saved-address
 
-    (contains? account-addresses user-input)
-    :own-account
+      (contains? account-addresses address-without-prefix)
+      :own-account
 
-    (not
-     (or (validation/eth-address? user-input)
-         (validation/ens-name? user-input)))
-    :invalid-address-or-ens))
+      (not
+       (or (validation/eth-address? user-input)
+           (validation/ens-name? user-input)))
+      :invalid-address-or-ens)))
 
 (defn- address-input
   [{:keys [input-value on-change-text paste-into-input clear-input]}]
@@ -93,8 +95,9 @@
 
 (defn- existing-saved-address
   [{:keys [address]}]
-  (let [{:keys [name customization-color chain-short-names ens ens?]}
-        (rf/sub [:wallet/saved-address-by-address address])]
+  (let [[_ address-without-prefix] (utils/split-prefix-and-address address)
+        {:keys [name customization-color chain-short-names ens ens?]}
+        (rf/sub [:wallet/saved-address-by-address address-without-prefix])]
     [rn/view {:style style/existing-saved-address-container}
      [quo/text
       {:size   :paragraph-1
@@ -105,7 +108,7 @@
       {:blur?           true
        :active-state?   true
        :user-props      {:name                name
-                         :address             (str chain-short-names address)
+                         :address             (str chain-short-names address-without-prefix)
                          :ens                 (when ens? ens)
                          :customization-color customization-color
                          :blur?               true}
@@ -168,20 +171,21 @@
     (rn/use-mount #(rf/dispatch [:wallet/clear-address-to-save]))
     [quo/overlay {:type :shell}
      [floating-button-page/view
-      {:footer-container-padding 0
-       :header                   [quo/page-nav
-                                  {:type                :no-title
-                                   :icon-name           :i/close
-                                   :behind-overlay?     true
-                                   :on-press            navigate-back
-                                   :margin-top          (safe-area/get-top)
-                                   :accessibility-label :add-address-to-save-page-nav}]
-       :footer                   (when (= view-id :screen/settings.add-address-to-save)
-                                   [quo/button
-                                    {:customization-color profile-color
-                                     :disabled?           button-disabled?
-                                     :on-press            on-press-continue}
-                                    (i18n/label :t/continue)])}
+      {:footer-container-padding     0
+       :keyboard-should-persist-taps :handled
+       :header                       [quo/page-nav
+                                      {:type                :no-title
+                                       :icon-name           :i/close
+                                       :behind-overlay?     true
+                                       :on-press            navigate-back
+                                       :margin-top          (safe-area/get-top)
+                                       :accessibility-label :add-address-to-save-page-nav}]
+       :footer                       (when (= view-id :screen/settings.add-address-to-save)
+                                       [quo/button
+                                        {:customization-color profile-color
+                                         :disabled?           button-disabled?
+                                         :on-press            on-press-continue}
+                                        (i18n/label :t/continue)])}
       [quo/page-top
        {:container-style  style/header-container
         :blur?            true

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

@@ -105,24 +105,25 @@
                          [ens ens? open-network-preferences address-text])]
     [quo/overlay {:type :shell}
      [floating-button-page/view
-      {:footer-container-padding (if edit? (+ (safe-area/get-bottom) 12) 0)
-       :header                   [quo/page-nav
-                                  {:type                :no-title
-                                   :background          :blur
-                                   :icon-name           (if edit? :i/close :i/arrow-left)
-                                   :on-press            navigate-back
-                                   :margin-top          (when-not edit? (safe-area/get-top))
-                                   :accessibility-label :save-address-page-nav}]
-       :footer                   [quo/button
-                                  {:accessibility-label :save-address-button
-                                   :type                :primary
-                                   :customization-color address-color
-                                   :disabled?           (string/blank? address-label)
-                                   :on-press            on-press-save}
-                                  (i18n/label :t/save-address)]
-       :customization-color      address-color
-       :gradient-cover?          true
-       :shell-overlay?           true}
+      {:footer-container-padding     (if edit? (+ (safe-area/get-bottom) 12) 0)
+       :keyboard-should-persist-taps :handled
+       :header                       [quo/page-nav
+                                      {:type                :no-title
+                                       :background          :blur
+                                       :icon-name           (if edit? :i/close :i/arrow-left)
+                                       :on-press            navigate-back
+                                       :margin-top          (when-not edit? (safe-area/get-top))
+                                       :accessibility-label :save-address-page-nav}]
+       :footer                       [quo/button
+                                      {:accessibility-label :save-address-button
+                                       :type                :primary
+                                       :customization-color address-color
+                                       :disabled?           (string/blank? address-label)
+                                       :on-press            on-press-save}
+                                      (i18n/label :t/save-address)]
+       :customization-color          address-color
+       :gradient-cover?              true
+       :shell-overlay?               true}
       [quo/wallet-user-avatar
        {:full-name           (if (string/blank? address-label)
                                placeholder

src/status_im/contexts/wallet/bridge/input_amount/view.cljs

@@ -12,13 +12,16 @@
   (hot-reload/use-safe-unmount #(rf/dispatch [:wallet/clean-routes-calculation]))
   [rn/view {:style style/bridge-send-wrapper}
    [input-amount/view
-    {:current-screen-id :screen/wallet.bridge-input-amount
-     :button-one-label  (i18n/label :t/review-bridge)
-     :button-one-props  {:icon-left :i/bridge}
-     :on-confirm        (fn [amount]
-                          (rf/dispatch [:wallet/set-token-amount-to-bridge
-                                        {:amount   amount
-                                         :stack-id :screen/wallet.bridge-input-amount}]))
-     :on-navigate-back  (fn []
-                          (rf/dispatch [:wallet/clean-disabled-from-networks])
-                          (rf/dispatch [:wallet/clean-send-amount]))}]])
+    {:current-screen-id      :screen/wallet.bridge-input-amount
+     :button-one-label       (i18n/label :t/review-bridge)
+     :button-one-props       {:icon-left :i/bridge}
+     :enabled-from-chain-ids (rf/sub
+                              [:wallet/bridge-from-chain-ids])
+     :from-enabled-networks  (rf/sub [:wallet/bridge-from-networks])
+     :on-confirm             (fn [amount]
+                               (rf/dispatch [:wallet/set-token-amount-to-bridge
+                                             {:amount   amount
+                                              :stack-id :screen/wallet.bridge-input-amount}]))
+     :on-navigate-back       (fn []
+                               (rf/dispatch [:wallet/clean-disabled-from-networks])
+                               (rf/dispatch [:wallet/clean-send-amount]))}]])

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

@@ -146,6 +146,8 @@
     button-one-props         :button-one-props
     current-screen-id        :current-screen-id
     initial-crypto-currency? :initial-crypto-currency?
+    enabled-from-chain-ids   :enabled-from-chain-ids
+    from-enabled-networks    :from-enabled-networks
     :or                      {initial-crypto-currency? true}}]
   (let [_ (rn/dismiss-keyboard!)
         bottom                                      (safe-area/get-bottom)
@@ -164,9 +166,6 @@
          token-decimals :decimals
          :as
          token}                                     (rf/sub [:wallet/wallet-send-token])
-        send-enabled-networks                       (rf/sub [:wallet/wallet-send-enabled-networks])
-        enabled-from-chain-ids                      (rf/sub
-                                                     [:wallet/wallet-send-enabled-from-chain-ids])
         send-from-locked-amounts                    (rf/sub [:wallet/wallet-send-from-locked-amounts])
         {token-balance     :total-balance
          available-balance :available-balance
@@ -355,7 +354,7 @@
        :currency-symbol  currency-symbol
        :crypto-decimals  (min token-decimals 6)
        :error?           (controlled-input/input-error input-state)
-       :networks         (seq send-enabled-networks)
+       :networks         (seq from-enabled-networks)
        :title            (i18n/label
                           :t/send-limit
                           {:limit (if crypto-currency?
@@ -429,3 +428,4 @@
                                (set-just-toggled-mode? false)
                                (set-input-state controlled-input/delete-all)
                                (rf/dispatch [:wallet/clean-suggested-routes]))}]]))
+

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

@@ -8,9 +8,12 @@
 (defn view
   []
   [input-amount/view
-   {:current-screen-id :screen/wallet.send-input-amount
-    :button-one-label  (i18n/label :t/review-send)
-    :on-navigate-back  (fn []
-                         (rf/dispatch [:wallet/clean-disabled-from-networks])
-                         (rf/dispatch [:wallet/clean-from-locked-amounts])
-                         (rf/dispatch [:wallet/clean-send-amount]))}])
+   {:current-screen-id      :screen/wallet.send-input-amount
+    :button-one-label       (i18n/label :t/review-send)
+    :enabled-from-chain-ids (rf/sub
+                             [:wallet/wallet-send-enabled-from-chain-ids])
+    :from-enabled-networks  (rf/sub [:wallet/wallet-send-enabled-networks])
+    :on-navigate-back       (fn []
+                              (rf/dispatch [:wallet/clean-disabled-from-networks])
+                              (rf/dispatch [:wallet/clean-from-locked-amounts])
+                              (rf/dispatch [:wallet/clean-send-amount]))}])

src/status_im/contexts/wallet/wallet_connect/core.cljs

@@ -3,6 +3,7 @@
             [clojure.string :as string]
             [native-module.core :as native-module]
             [status-im.constants :as constants]
+            [status-im.contexts.wallet.common.utils.networks :as networks]
             [utils.security.core :as security]
             [utils.string]
             [utils.transforms :as transforms]))
@@ -101,7 +102,7 @@
         networks   (get-in db [:wallet :networks (if test-mode? :test :prod)])]
     (mapv #(-> % :chain-id) networks)))
 
-(defn add-full-testnet-name
+(defn- add-full-testnet-name
   "Updates the `:full-name` key with the full testnet name if using testnet `:chain-id`.\n
   e.g. `{:full-name \"Mainnet\"}` -> `{:full-name \"Mainnet Sepolia\"`}`"
   [network]
@@ -112,6 +113,12 @@
       constants/goerli-chain-ids  (add-testnet-name constants/goerli-full-name)
       network)))
 
+(defn chain-id->network-details
+  [chain-id]
+  (-> chain-id
+      (networks/get-network-details)
+      (add-full-testnet-name)))
+
 (defn event-should-be-handled?
   [db {:keys [topic]}]
   (some #(= topic %)

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

@@ -64,6 +64,7 @@
      (if (and (not-empty session-networks) required-networks-supported?)
        {:db (update db
                     :wallet-connect/current-proposal assoc
+                    :response-sent?                  false
                     :request                         proposal
                     :session-networks                session-networks
                     :address                         (or current-viewing-address
@@ -154,7 +155,8 @@
                                          :methods  constants/wallet-connect-supported-methods
                                          :events   constants/wallet-connect-supported-events
                                          :accounts accounts}})]
-     {:fx [[:effects.wallet-connect/approve-session
+     {:db (assoc-in db [:wallet-connect/current-proposal :response-sent?] true)
+      :fx [[:effects.wallet-connect/approve-session
             {:web3-wallet          web3-wallet
              :proposal             current-proposal
              :supported-namespaces supported-namespaces

src/status_im/contexts/wallet/wallet_connect/modals/common/page_nav/view.cljs

@@ -7,6 +7,5 @@
   [quo/page-nav
    {:icon-name           :i/close
     :background          :blur
-    :on-press            #(do (rf/dispatch [:navigate-back])
-                              (rf/dispatch [:wallet-connect/reject-session-request]))
+    :on-press            #(rf/dispatch [:wallet-connect/dismiss-request-modal])
     :accessibility-label accessibility-label}])

src/status_im/contexts/wallet/wallet_connect/modals/send_transaction/view.cljs

@@ -22,6 +22,7 @@
         network               (rf/sub [:wallet-connect/current-request-network])
         {:keys [max-fees-fiat-formatted
                 error-state]} (rf/sub [:wallet-connect/current-request-transaction-information])]
+    (rn/use-unmount #(rf/dispatch [:wallet-connect/on-request-modal-dismissed]))
     [rn/view {:style (style/container bottom)}
      [quo/gradient-cover {:customization-color customization-color}]
      [page-nav/view

src/status_im/contexts/wallet/wallet_connect/modals/sign_message/view.cljs

@@ -18,6 +18,7 @@
         {:keys [customization-color]
          :as   account} (rf/sub [:wallet-connect/current-request-account-details])
         dapp            (rf/sub [:wallet-connect/current-request-dapp])]
+    (rn/use-unmount #(rf/dispatch [:wallet-connect/on-request-modal-dismissed]))
     [rn/view {:style (style/container bottom)}
      [quo/gradient-cover {:customization-color customization-color}]
      [page-nav/view

src/status_im/contexts/wallet/wallet_connect/modals/sign_transaction/view.cljs

@@ -21,6 +21,7 @@
         network               (rf/sub [:wallet-connect/current-request-network])
         {:keys [max-fees-fiat-formatted
                 error-state]} (rf/sub [:wallet-connect/current-request-transaction-information])]
+    (rn/use-unmount #(rf/dispatch [:wallet-connect/on-request-modal-dismissed]))
     [rn/view {:style (style/container bottom)}
      [quo/gradient-cover {:customization-color customization-color}]
      [page-nav/view

src/status_im/contexts/wallet/wallet_connect/processing_events.cljs

@@ -5,8 +5,10 @@
             [re-frame.core :as rf]
             [status-im.constants :as constants]
             [status-im.contexts.wallet.wallet-connect.core :as wallet-connect-core]
+            [status-im.contexts.wallet.wallet-connect.signing :as signing]
             [status-im.contexts.wallet.wallet-connect.transactions :as transactions]
             [taoensso.timbre :as log]
+            [utils.i18n :as i18n]
             [utils.transforms :as transforms]))
 
 (rf/reg-event-fx
@@ -27,7 +29,9 @@
          existing-event (get-in db [:wallet-connect/current-request :event])]
      ;; NOTE: make sure we don't show two requests at the same time
      (when-not existing-event
-       {:db (assoc-in db [:wallet-connect/current-request :event] event)
+       {:db (-> db
+                (assoc-in [:wallet-connect/current-request :event] event)
+                (assoc-in [:wallet-connect/current-request :response-sent?] false))
         :fx [(condp = method
                constants/wallet-connect-eth-send-transaction-method
                [:dispatch [:wallet-connect/process-eth-send-transaction]]
@@ -122,15 +126,30 @@
  :wallet-connect/process-sign-typed
  (fn [{:keys [db]}]
    (let [[address raw-data] (wallet-connect-core/get-db-current-request-params db)
-         parsed-data        (try (-> raw-data
-                                     transforms/js-parse
+         parsed-raw-data    (transforms/js-parse raw-data)
+         session-chain-id   (-> (wallet-connect-core/get-db-current-request-event db)
+                                (get-in [:params :chainId])
+                                wallet-connect-core/eip155->chain-id)
+         data-chain-id      (-> parsed-raw-data
+                                transforms/js->clj
+                                signing/typed-data-chain-id)
+         parsed-data        (try (-> parsed-raw-data
                                      (transforms/js-dissoc :types :primaryType)
                                      (transforms/js-stringify 2))
                                  (catch js/Error _ nil))]
-     (if (nil? parsed-data)
+     (cond
+       (nil? parsed-data)
        {:fx [[:dispatch
               [:wallet-connect/on-processing-error
                (ex-info "Failed to parse JSON typed data" {:data raw-data})]]]}
+
+       (not= session-chain-id data-chain-id)
+       {:fx [[:dispatch
+              [:wallet-connect/wrong-typed-data-chain-id
+               {:expected-chain-id session-chain-id
+                :wrong-chain-id    data-chain-id}]]]}
+
+       :else
        {:db (update-in db
                        [:wallet-connect/current-request]
                        assoc
@@ -139,19 +158,39 @@
                        :raw-data     raw-data)
         :fx [[:dispatch [:wallet-connect/show-request-modal]]]}))))
 
+(rf/reg-event-fx
+ :wallet-connect/wrong-typed-data-chain-id
+ (fn [_ [{:keys [expected-chain-id wrong-chain-id]}]]
+   (let [wrong-network-name    (-> wrong-chain-id
+                                   wallet-connect-core/chain-id->network-details
+                                   :full-name)
+         expected-network-name (-> expected-chain-id
+                                   wallet-connect-core/chain-id->network-details
+                                   :full-name)
+         toast-message         (i18n/label :t/wallet-connect-typed-data-wrong-chain-id-warning
+                                           {:wrong-chain    wrong-network-name
+                                            :expected-chain expected-network-name})]
+     {:fx [[:dispatch
+            [:toasts/upsert
+             {:type  :negative
+              :theme :dark
+              :text  toast-message}]]
+           [:dispatch
+            [:wallet-connect/on-processing-error
+             (ex-info "Can't proceed signing typed data due to wrong chain-id included in the data"
+                      {:expected-chain-id expected-chain-id
+                       :wrong-chain-id    wrong-chain-id})]]]})))
+
 ;; TODO: we should reject a request if processing fails
 (rf/reg-event-fx
  :wallet-connect/on-processing-error
  (fn [{:keys [db]} [error]]
    (let [{:keys [address event]} (get db :wallet-connect/current-request)
-         method                  (wallet-connect-core/get-request-method event)
-         screen                  (wallet-connect-core/method-to-screen method)]
+         method                  (wallet-connect-core/get-request-method event)]
      (log/error "Failed to process Wallet Connect request"
                 {:error                error
                  :address              address
                  :method               method
                  :wallet-connect-event event
                  :event                :wallet-connect/on-processing-error})
-
-     {:fx [[:dispatch [:dismiss-modal screen]]
-           [:dispatch [:wallet-connect/reset-current-request]]]})))
+     {:fx [[:dispatch [:wallet-connect/dismiss-request-modal]]]})))

src/status_im/contexts/wallet/wallet_connect/responding_events.cljs

@@ -39,7 +39,7 @@
              :data       raw-data
              :rpc-method rpc-method
              :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
-             :on-success #(rf/dispatch [:wallet-connect/send-response {:result %}])}]]})))
+             :on-success #(rf/dispatch [:wallet-connect/finish-session-request %])}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/respond-sign-typed-data
@@ -53,7 +53,7 @@
              :chain-id   chain-id
              :version    typed-data-version
              :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
-             :on-success #(rf/dispatch [:wallet-connect/send-response {:result %}])}]]})))
+             :on-success #(rf/dispatch [:wallet-connect/finish-session-request %])}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/respond-send-transaction-data
@@ -67,7 +67,7 @@
              :tx-hash    tx-hash
              :tx-args    tx-args
              :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
-             :on-success #(rf/dispatch [:wallet-connect/send-response {:result %}])}]]})))
+             :on-success #(rf/dispatch [:wallet-connect/finish-session-request %])}]]})))
 
 (rf/reg-event-fx
  :wallet-connect/respond-sign-transaction-data
@@ -81,15 +81,13 @@
              :tx-hash    tx-hash
              :tx-params  tx-args
              :on-error   #(rf/dispatch [:wallet-connect/on-sign-error %])
-             :on-success #(rf/dispatch [:wallet-connect/send-response {:result %}])}]]})))
+             :on-success #(rf/dispatch [:wallet-connect/finish-session-request %])}]]})))
 
-;; TODO: should reject if "signing" fails
 (rf/reg-event-fx
  :wallet-connect/on-sign-error
  (fn [{:keys [db]} [error]]
    (let [{:keys [raw-data address event]} (get db :wallet-connect/current-request)
-         method                           (wallet-connect-core/get-request-method event)
-         screen                           (wallet-connect-core/method-to-screen method)]
+         method                           (wallet-connect-core/get-request-method event)]
      (log/error "Failed to sign Wallet Connect request"
                 {:error                error
                  :address              address
@@ -97,56 +95,81 @@
                  :method               method
                  :wallet-connect-event event
                  :event                :wallet-connect/on-sign-error})
-     {:fx [[:dispatch [:dismiss-modal screen]]
-           [:dispatch [:wallet-connect/reset-current-request]]]})))
+     {:fx [[:dispatch [:wallet-connect/dismiss-request-modal]]]})))
 
 (rf/reg-event-fx
  :wallet-connect/send-response
- (fn [{:keys [db]} [{:keys [result error]}]]
-   (let [{:keys [id topic] :as event} (get-in db [:wallet-connect/current-request :event])
-         method                       (wallet-connect-core/get-request-method event)
-         screen                       (wallet-connect-core/method-to-screen method)
-         web3-wallet                  (get db :wallet-connect/web3-wallet)]
-     {:fx [[:effects.wallet-connect/respond-session-request
-            {:web3-wallet web3-wallet
-             :topic       topic
-             :id          id
-             :result      result
-             :error       error
-             :on-error    (fn [error]
-                            (log/error "Failed to send Wallet Connect response"
-                                       {:error                error
-                                        :method               method
-                                        :event                :wallet-connect/send-response
-                                        :wallet-connect-event event})
-                            (rf/dispatch [:dismiss-modal screen])
-                            (rf/dispatch [:wallet-connect/reset-current-request]))
-             :on-success  (fn []
-                            (log/info "Successfully sent Wallet Connect response to dApp")
-                            (rf/dispatch [:dismiss-modal screen])
-                            (rf/dispatch [:wallet-connect/reset-current-request]))}]]})))
+ (fn [{:keys [db]} [{:keys [result error no-dismiss-modal?]}]]
+   (when-let [{:keys [id topic] :as event} (get-in db [:wallet-connect/current-request :event])]
+     (let [method      (wallet-connect-core/get-request-method event)
+           screen      (wallet-connect-core/method-to-screen method)
+           web3-wallet (get db :wallet-connect/web3-wallet)]
+       {:db (assoc-in db [:wallet-connect/current-request :response-sent?] true)
+        :fx [[:effects.wallet-connect/respond-session-request
+              {:web3-wallet web3-wallet
+               :topic       topic
+               :id          id
+               :result      result
+               :error       error
+               :on-error    (fn [error]
+                              (log/error "Failed to send Wallet Connect response"
+                                         {:error                error
+                                          :method               method
+                                          :event                :wallet-connect/send-response
+                                          :wallet-connect-event event})
+                              ;; FIXME(@clauxx): this is no good and we should fix it ASAP. IMO the
+                              ;; dispatcher of send-response should be responsible for success/error
+                              ;; behavior, including dismissing the modal. The flag ugly as hell.
+                              (when-not no-dismiss-modal?
+                                (rf/dispatch [:dismiss-modal screen])))
+               :on-success  (fn []
+                              (log/info "Successfully sent Wallet Connect response to dApp")
+                              (when-not no-dismiss-modal?
+                                (rf/dispatch [:dismiss-modal screen])))}]]}))))
+
+(rf/reg-event-fx
+ :wallet-connect/dismiss-request-modal
+ (fn [{:keys [db]} _]
+   (let [screen (-> db
+                    (get-in [:wallet-connect/current-request :event])
+                    wallet-connect-core/get-request-method
+                    wallet-connect-core/method-to-screen)]
+     {:fx [[:dispatch [:dismiss-modal screen]]]})))
+
+(rf/reg-event-fx
+ :wallet-connect/finish-session-request
+ (fn [_ [result]]
+   {:fx [[:dispatch [:wallet-connect/send-response {:result result}]]
+         [:dispatch [:wallet-connect/dismiss-request-modal]]]}))
 
 (rf/reg-event-fx
  :wallet-connect/reject-session-proposal
  (fn [{:keys [db]} _]
-   (let [web3-wallet      (get db :wallet-connect/web3-wallet)
-         current-proposal (get-in db [:wallet-connect/current-proposal :request])]
-     {:fx [[:effects.wallet-connect/reject-session-proposal
-            {:web3-wallet web3-wallet
-             :proposal    current-proposal
-             :on-success  #(log/info "Wallet Connect session proposal rejected")
-             :on-error    #(log/error "Wallet Connect unable to reject session proposal")}]
+   (let [web3-wallet                      (get db :wallet-connect/web3-wallet)
+         {:keys [request response-sent?]} (:wallet-connect/current-proposal db)]
+     {:fx [(when-not response-sent?
+             [:effects.wallet-connect/reject-session-proposal
+              {:web3-wallet web3-wallet
+               :proposal    request
+               :on-success  #(log/info "Wallet Connect session proposal rejected")
+               :on-error    #(log/error "Wallet Connect unable to reject session proposal")}])
            [:dispatch [:wallet-connect/reset-current-session-proposal]]]})))
 
-;; NOTE: Currently we only reject a session if the user rejected it
+;; NOTE: Currently we only reject a session if the user dismissed a modal
+;; without accepting the session first.
 ;; But this needs to be solidified to ensure other cases:
 ;; - Unsupported WC version
 ;; - Invalid params from dapps
 ;; - Unsupported method
+;; - Failed processing of request
+;; - Failed "responding" (signing or sending message/transaction)
 (rf/reg-event-fx
- :wallet-connect/reject-session-request
- (fn [_ _]
-   {:fx [[:dispatch
-          [:wallet-connect/send-response
-           {:error (wallet-connect/get-sdk-error
-                    constants/wallet-connect-user-rejected-error-key)}]]]}))
+ :wallet-connect/on-request-modal-dismissed
+ (fn [{:keys [db]}]
+   {:fx [(when-not (get-in db [:wallet-connect/current-request :response-sent?])
+           [:dispatch
+            [:wallet-connect/send-response
+             {:error             (wallet-connect/get-sdk-error
+                                  constants/wallet-connect-user-rejected-error-key)
+              :no-dismiss-modal? true}]])
+         [:dispatch [:wallet-connect/reset-current-request]]]}))

src/status_im/contexts/wallet/wallet_connect/session_proposal/view.cljs

@@ -148,10 +148,9 @@
       :button-two-label        (i18n/label :t/decline)
       :button-two-props        {:type                :grey
                                 :accessibility-label :wc-deny-connection
-                                :on-press            (fn []
-                                                       (rf/dispatch [:navigate-back])
-                                                       (rf/dispatch
-                                                        [:wallet-connect/reject-session-proposal]))}
+                                :on-press            #(rf/dispatch
+                                                       [:dismiss-modal
+                                                        :screen/wallet.wallet-connect-session-proposal])}
       :button-one-label        (i18n/label :t/connect)
       :button-one-props        {:customization-color customization-color
                                 :type                :primary
@@ -165,11 +164,13 @@
    {:type                :no-title
     :background          :blur
     :icon-name           :i/close
-    :on-press            (rn/use-callback #(rf/dispatch [:navigate-back]))
+    :on-press            (rn/use-callback
+                          #(rf/dispatch [:dismiss-modal :screen/wallet.wallet-connect-session-proposal]))
     :accessibility-label :wc-session-proposal-top-bar}])
 
 (defn view
   []
+  (rn/use-unmount #(rf/dispatch [:wallet-connect/reject-session-proposal]))
   [floating-button-page/view
    {:footer-container-padding 0
     :header                   [header]

src/status_im/contexts/wallet/wallet_connect/signing.cljs

@@ -6,6 +6,20 @@
             [utils.hex :as hex]
             [utils.transforms :as transforms]))
 
+(defn typed-data-chain-id
+  "Returns the `:chain-id` from typed data if it's present and if the EIP712 domain defines it. Without
+  the `:chain-id` in the domain type, it will not be signed as part of the typed-data."
+  [typed-data]
+  (let [chain-id-type? (->> typed-data
+                            :types
+                            :EIP712Domain
+                            (some #(= "chainId" (:name %))))
+        data-chain-id  (-> typed-data
+                           :domain
+                           :chainId)]
+    (when chain-id-type?
+      data-chain-id)))
+
 (defn eth-sign
   [password address data]
   (-> {:data     data

src/status_im/subs/wallet/send.cljs

@@ -61,3 +61,22 @@
  :wallet/send-token-not-supported-in-receiver-networks?
  :<- [:wallet/wallet-send]
  :-> :token-not-supported-in-receiver-networks?)
+
+(rf/reg-sub
+ :wallet/bridge-from-networks
+ :<- [:wallet/wallet-send]
+ :<- [:wallet/network-details]
+ (fn [[{:keys [bridge-to-chain-id]} networks]]
+   (set (filter (fn [network]
+                  (not= (:chain-id network) bridge-to-chain-id))
+                networks))))
+
+(rf/reg-sub
+ :wallet/bridge-from-chain-ids
+ :<- [:wallet/wallet-send]
+ :<- [:wallet/networks-by-mode]
+ (fn [[{:keys [bridge-to-chain-id]} networks]]
+   (keep (fn [network]
+           (when (not= (:chain-id network) bridge-to-chain-id)
+             (:chain-id network)))
+         networks)))

src/status_im/subs/wallet/wallet_connect.cljs

@@ -2,7 +2,6 @@
   (:require [clojure.string :as string]
             [re-frame.core :as rf]
             [status-im.contexts.wallet.common.utils :as wallet-utils]
-            [status-im.contexts.wallet.common.utils.networks :as networks]
             [status-im.contexts.wallet.wallet-connect.core :as wallet-connect-core]
             [status-im.contexts.wallet.wallet-connect.transactions :as transactions]
             [utils.money :as money]
@@ -70,10 +69,7 @@
 (rf/reg-sub
  :wallet-connect/current-request-network
  :<- [:wallet-connect/chain-id]
- (fn [chain-id]
-   (-> chain-id
-       (networks/get-network-details)
-       (wallet-connect-core/add-full-testnet-name))))
+ wallet-connect-core/chain-id->network-details)
 
 (rf/reg-sub
  :wallet-connect/transaction-args

translations/en.json

@@ -2642,6 +2642,7 @@
   "wallet-connect-sign-transaction-header": "wants you to sign this transaction with",
   "wallet-connect-sign-transaction-warning": "Sign transactions only if you trust the dApp",
   "wallet-connect-sign-warning": "Sign only if you trust the dApp",
+  "wallet-connect-typed-data-wrong-chain-id-warning": "Wrong network in the request data. Expected '{{expected-chain}}', but got '{{wrong-chain}}'",
   "wallet-connect-version-not-supported": "WalletConnect version {{version}} is not supported",
   "wallet-connect-via": "via",
   "wallet-connect-wrong-qr": "It’s not a WalletConnect QR",