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/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/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 [:wallet-connect/dismiss-request-modal])
-                              (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

@@ -29,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]]
@@ -191,4 +193,4 @@
                  :method               method
                  :wallet-connect-event event
                  :event                :wallet-connect/on-processing-error})
-     {:fx [[:dispatch [:wallet-connect/reject-session-request]]]})))
+     {:fx [[:dispatch [:wallet-connect/dismiss-request-modal]]]})))

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

@@ -95,31 +95,37 @@
                  :method               method
                  :wallet-connect-event event
                  :event                :wallet-connect/on-sign-error})
-     {:fx [[:dispatch [:wallet-connect/reject-session-request]]
-           [:dispatch [:wallet-connect/dismiss-request-modal]]]})))
+     {: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)
-         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 [:wallet-connect/reset-current-request]))
-             :on-success  (fn []
-                            (log/info "Successfully sent Wallet Connect response to dApp")
-                            (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
@@ -139,16 +145,18 @@
 (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
@@ -156,9 +164,12 @@
 ;; - 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]