From 6e761cad838cd55826deac1b97ee3271ad20a484 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Thu, 14 Jun 2018 16:23:43 +0300 Subject: [PATCH] [#4763] prevent navigation back to transaction --- src/status_im/ui/screens/wallet/send/events.cljs | 5 ++--- src/status_im/utils/mixpanel_events.cljs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/status_im/ui/screens/wallet/send/events.cljs b/src/status_im/ui/screens/wallet/send/events.cljs index 508ff8bf2e..49af871685 100644 --- a/src/status_im/ui/screens/wallet/send/events.cljs +++ b/src/status_im/ui/screens/wallet/send/events.cljs @@ -267,7 +267,7 @@ (cond-> {:dispatch [:navigate-back]} (= method constants/web3-send-transaction) (assoc :dispatch-later [{:ms 400 :dispatch [:navigate-to-modal :wallet-transaction-sent-modal]}])) - {:dispatch [:navigate-to :wallet-transaction-sent]})))))) + {:dispatch [:navigation-replace :wallet-transaction-sent]})))))) (defn on-transactions-modal-completed [raw-results] (let [result (types/json->clj raw-results)] @@ -410,7 +410,6 @@ :close-transaction-sent-screen (fn [{:keys [db]} [_ chat-id]] {:dispatch (condp = (second (:navigation-stack db)) - :wallet-send-transaction [:navigate-to-clean :wallet] - :wallet-send-transaction-chat [:execute-stored-command-and-return-to-chat chat-id] + :chat [:execute-stored-command-and-return-to-chat chat-id] [:navigate-back]) :dispatch-later [{:ms 400 :dispatch [:check-transactions-queue]}]})) diff --git a/src/status_im/utils/mixpanel_events.cljs b/src/status_im/utils/mixpanel_events.cljs index f215b0a618..a55e73303c 100644 --- a/src/status_im/utils/mixpanel_events.cljs +++ b/src/status_im/utils/mixpanel_events.cljs @@ -145,7 +145,7 @@ :trigger [:navigate-to-clean :wallet] :properties {:target :wallet-got-it}} {:label "Tap" - :trigger [:navigate-to :wallet-transaction-sent] + :trigger [:navigation-replace :wallet-transaction-sent] :properties {:target :wallet-transaction-sent}} ;;Profile