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

fix: always navigate back to shell stack when closing watch account screen (#18324) 

Signed-off-by: Brian Sztamfater <brian@status.im>
This commit is contained in:
Brian Sztamfater 2024-01-05 12:38:58 -03:00 committed by GitHub
parent 947a1ef29c
commit 4b3bc73239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/status_im/contexts/wallet/events.cljs
View File

@ -35,13 +35,7 @@
(fn [{:keys [db]} [address]] (fn [{:keys [db]} [address]]
{:db (assoc-in db [:wallet :current-viewing-account-address] address) {:db (assoc-in db [:wallet :current-viewing-account-address] address)
:fx [[:dispatch [:hide-bottom-sheet]] :fx [[:dispatch [:hide-bottom-sheet]]
[:dispatch-later [:dispatch [:navigate-to :wallet-accounts address]]
[{:dispatch [:navigate-back]
:ms 100}
{:dispatch [:navigate-back]
:ms 100}
{:dispatch [:navigate-to :wallet-accounts address]
:ms 300}]]
[:dispatch [:wallet/show-account-created-toast address]]]})) [:dispatch [:wallet/show-account-created-toast address]]]}))
(rf/reg-event-fx :wallet/switch-current-viewing-account (rf/reg-event-fx :wallet/switch-current-viewing-account
@ -51,7 +45,7 @@
(rf/reg-event-fx :wallet/close-account-page (rf/reg-event-fx :wallet/close-account-page
(fn [{:keys [db]}] (fn [{:keys [db]}]
{:db (update db :wallet dissoc :current-viewing-account-address) {:db (update db :wallet dissoc :current-viewing-account-address)
:fx [[:dispatch [:navigate-back]]]})) :fx [[:dispatch [:pop-to-root :shell-stack]]]}))
(rf/reg-event-fx (rf/reg-event-fx
:wallet/get-accounts-success :wallet/get-accounts-success

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

@ -280,7 +280,10 @@
:component emoji-picker/view} :component emoji-picker/view}
{:name :wallet-accounts {:name :wallet-accounts
:options {:insets {:top? true}} :options {:insets {:top? true}
:popGesture false
:hardwareBackButton {:dismissModalOnPress false
:popStackOnPress false}}
:component wallet-accounts/view} :component wallet-accounts/view}
{:name :wallet-edit-account {:name :wallet-edit-account