status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#21439] fix: close swap flow after confirmation (#21466) 

Signed-off-by: Brian Sztamfater <brian@status.im>
This commit is contained in:
Mohsen 2024-10-23 17:41:36 +03:00 committed by GitHub
parent e1abe5c6e2
commit ea18966f33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/status_im/contexts/wallet/swap/events.cljs
View File

@ -17,6 +17,7 @@
(fn [{:keys [db]} [{:keys [network asset-to-receive open-new-screen?] :as data}]] (fn [{:keys [db]} [{:keys [network asset-to-receive open-new-screen?] :as data}]]
(let [{:keys [wallet]} db (let [{:keys [wallet]} db
test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?]) test-networks-enabled? (get-in db [:profile/profile :test-networks-enabled?])
view-id (:view-id db)
account (swap-utils/wallet-account wallet) account (swap-utils/wallet-account wallet)
asset-to-pay (if (get-in data [:asset-to-pay :networks]) asset-to-pay (if (get-in data [:asset-to-pay :networks])
(:asset-to-pay data) (:asset-to-pay data)
@ -30,12 +31,13 @@
{:db (-> db {:db (-> db
(assoc-in [:wallet :ui :swap :asset-to-pay] asset-to-pay) (assoc-in [:wallet :ui :swap :asset-to-pay] asset-to-pay)
(assoc-in [:wallet :ui :swap :asset-to-receive] asset-to-receive) (assoc-in [:wallet :ui :swap :asset-to-receive] asset-to-receive)
(assoc-in [:wallet :ui :swap :network] network')) (assoc-in [:wallet :ui :swap :network] network')
(assoc-in [:wallet :ui :swap :launch-screen] view-id))
:fx (if network' :fx (if network'
[[:dispatch [:wallet/switch-current-viewing-account (:address account)]] [[:dispatch [:wallet/switch-current-viewing-account (:address account)]]
[:dispatch [:dispatch
(if open-new-screen? (if open-new-screen?
[:navigate-to :screen/wallet.setup-swap] [:open-modal :screen/wallet.setup-swap]
[:navigate-to-within-stack [:navigate-to-within-stack
[:screen/wallet.setup-swap :screen/wallet.swap-select-asset-to-pay]])] [:screen/wallet.setup-swap :screen/wallet.swap-select-asset-to-pay]])]
[:dispatch [:wallet.swap/set-default-slippage]]] [:dispatch [:wallet.swap/set-default-slippage]]]
@ -293,7 +295,7 @@
:screen/wallet.swap-set-spending-cap :screen/wallet.swap-set-spending-cap
:screen/wallet.swap-confirmation)]) :screen/wallet.swap-confirmation)])
(when-not approval-required? (when-not approval-required?
(rf/dispatch [:wallet/select-account-tab :activity]) (rf/dispatch [:wallet/end-swap-flow])
(debounce/debounce-and-dispatch (debounce/debounce-and-dispatch
[:toasts/upsert [:toasts/upsert
{:id :swap-transaction-pending {:id :swap-transaction-pending
@ -419,3 +421,12 @@
:last-request-uuid :last-request-uuid
:approved-amount :approved-amount
:approval-transaction-id)))}))) :approval-transaction-id)))})))
(rf/reg-event-fx :wallet/end-swap-flow
(fn [{:keys [db]}]
(let [launch-screen (get-in db [:wallet :ui :swap :launch-screen])
address (get-in db [:wallet :current-viewing-account-address])]
{:fx [(when (= launch-screen :wallet-stack)
[:dispatch [:wallet/navigate-to-account-within-stack address]])
[:dispatch [:wallet/fetch-activities-for-current-account]]
[:dispatch [:wallet/select-account-tab :activity]]]})))

3
src/status_im/navigation/screens.cljs
View File

@ -541,7 +541,8 @@
:component wallet-swap-select-asset-to-pay/view} :component wallet-swap-select-asset-to-pay/view}
{:name :screen/wallet.setup-swap {:name :screen/wallet.setup-swap
:options {:insets {:bottom? true}} :options {:modalPresentationStyle :overCurrentContext
:insets {:bottom? true}}
:component wallet-swap-setup-swap/view} :component wallet-swap-setup-swap/view}
{:name :screen/wallet.swap-propasal {:name :screen/wallet.swap-propasal