From 6e75bfa291f31e44e2baaf3086e5f01f635df2ad Mon Sep 17 00:00:00 2001 From: Cristian Lungu Date: Fri, 20 Sep 2024 16:40:34 +0300 Subject: [PATCH] fix: stop bridge routes on amount confirm --- .../contexts/wallet/bridge/input_amount/view.cljs | 1 + src/status_im/contexts/wallet/send/input_amount/view.cljs | 8 +------- src/status_im/contexts/wallet/send/send_amount/view.cljs | 5 +++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/status_im/contexts/wallet/bridge/input_amount/view.cljs b/src/status_im/contexts/wallet/bridge/input_amount/view.cljs index 44ebea89fc..3911684615 100644 --- a/src/status_im/contexts/wallet/bridge/input_amount/view.cljs +++ b/src/status_im/contexts/wallet/bridge/input_amount/view.cljs @@ -19,6 +19,7 @@ [:wallet/bridge-from-chain-ids]) :from-enabled-networks (rf/sub [:wallet/bridge-from-networks]) :on-confirm (fn [amount] + (rf/dispatch [:wallet/stop-get-suggested-routes]) (rf/dispatch [:wallet/set-token-amount-to-bridge {:amount amount :stack-id :screen/wallet.bridge-input-amount}])) diff --git a/src/status_im/contexts/wallet/send/input_amount/view.cljs b/src/status_im/contexts/wallet/send/input_amount/view.cljs index 0418dbd9d4..87b1b86a9d 100644 --- a/src/status_im/contexts/wallet/send/input_amount/view.cljs +++ b/src/status_im/contexts/wallet/send/input_amount/view.cljs @@ -138,7 +138,7 @@ (defn view ;; crypto-decimals, limit-crypto and initial-crypto-currency? args are needed ;; for component tests only - [{default-on-confirm :on-confirm + [{on-confirm :on-confirm default-limit-crypto :limit-crypto default-crypto-decimals :crypto-decimals on-navigate-back :on-navigate-back @@ -155,11 +155,6 @@ on-navigate-back on-navigate-back [just-toggled-mode? set-just-toggled-mode?] (rn/use-state false) - handle-on-confirm (fn [amount] - (rf/dispatch [:wallet/stop-get-suggested-routes]) - (rf/dispatch [:wallet/set-token-amount-to-send - {:amount amount - :stack-id current-screen-id}])) {fiat-currency :currency} (rf/sub [:profile/profile]) {token-symbol :symbol token-networks :networks @@ -190,7 +185,6 @@ loading-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?]) route (rf/sub [:wallet/wallet-send-route]) - on-confirm (or default-on-confirm handle-on-confirm) crypto-decimals (or token-decimals default-crypto-decimals) input-value (controlled-input/input-value input-state) valid-input? (not (or (controlled-input/empty-value? input-state) diff --git a/src/status_im/contexts/wallet/send/send_amount/view.cljs b/src/status_im/contexts/wallet/send/send_amount/view.cljs index e076f893e8..1bb0c0ba3e 100644 --- a/src/status_im/contexts/wallet/send/send_amount/view.cljs +++ b/src/status_im/contexts/wallet/send/send_amount/view.cljs @@ -14,6 +14,11 @@ :button-one-label (i18n/label :t/review-send) :enabled-from-chain-ids (rf/sub [:wallet/wallet-send-enabled-from-chain-ids]) + :on-confirm (fn [amount] + (rf/dispatch [:wallet/stop-get-suggested-routes]) + (rf/dispatch [:wallet/set-token-amount-to-send + {:amount amount + :stack-id :screen/wallet.send-input-amount}])) :from-enabled-networks (rf/sub [:wallet/wallet-send-enabled-networks]) :on-navigate-back (fn [] (rf/dispatch [:wallet/clean-disabled-from-networks])