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

[#4763] prevent navigation back to transaction

This commit is contained in:
Roman Volosovskyi 2018-06-14 16:23:43 +03:00
parent 3b4d7eebc7
commit 6e761cad83
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/status_im/ui/screens/wallet/send/events.cljs
View File

@ -267,7 +267,7 @@
(cond-> {:dispatch [:navigate-back]} (cond-> {:dispatch [:navigate-back]}
(= method constants/web3-send-transaction) (= method constants/web3-send-transaction)
(assoc :dispatch-later [{:ms 400 :dispatch [:navigate-to-modal :wallet-transaction-sent-modal]}])) (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] (defn on-transactions-modal-completed [raw-results]
(let [result (types/json->clj raw-results)] (let [result (types/json->clj raw-results)]
@ -410,7 +410,6 @@
:close-transaction-sent-screen :close-transaction-sent-screen
(fn [{:keys [db]} [_ chat-id]] (fn [{:keys [db]} [_ chat-id]]
{:dispatch (condp = (second (:navigation-stack db)) {:dispatch (condp = (second (:navigation-stack db))
:wallet-send-transaction [:navigate-to-clean :wallet] :chat [:execute-stored-command-and-return-to-chat chat-id]
:wallet-send-transaction-chat [:execute-stored-command-and-return-to-chat chat-id]
[:navigate-back]) [:navigate-back])
:dispatch-later [{:ms 400 :dispatch [:check-transactions-queue]}]})) :dispatch-later [{:ms 400 :dispatch [:check-transactions-queue]}]}))

2
src/status_im/utils/mixpanel_events.cljs
View File

@ -145,7 +145,7 @@
:trigger [:navigate-to-clean :wallet] :trigger [:navigate-to-clean :wallet]
:properties {:target :wallet-got-it}} :properties {:target :wallet-got-it}}
{:label "Tap" {:label "Tap"
:trigger [:navigate-to :wallet-transaction-sent] :trigger [:navigation-replace :wallet-transaction-sent]
:properties {:target :wallet-transaction-sent}} :properties {:target :wallet-transaction-sent}}
;;Profile ;;Profile