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

[#4759] Handle back button properly after sending transaction (Android).

This commit is contained in:
Roman Volosovskyi 2018-06-18 14:39:13 +03:00
parent 0dd5c11b47
commit 71ff9d9035
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/status_im/android/core.cljs
View File

@ -21,7 +21,8 @@
(let [stack (subscribe [:get :navigation-stack]) (let [stack (subscribe [:get :navigation-stack])
result-box (subscribe [:get-current-chat-ui-prop :result-box]) result-box (subscribe [:get-current-chat-ui-prop :result-box])
webview (subscribe [:get :webview-bridge]) webview (subscribe [:get :webview-bridge])
view-id (subscribe [:get :view-id])] view-id (subscribe [:get :view-id])
chat-id (subscribe [:get-current-chat-id])]
(cond (cond
(and @webview (:can-go-back? @result-box)) (and @webview (:can-go-back? @result-box))
@ -30,6 +31,9 @@
(#{:home :wallet :my-profile} view-id) (#{:home :wallet :my-profile} view-id)
(do (.exitApp react/back-handler)) (do (.exitApp react/back-handler))
(= :wallet-transaction-sent @view-id)
(do (dispatch [:execute-stored-command-and-return-to-chat @chat-id]) true)
(< 1 (count @stack)) (< 1 (count @stack))
(do (dispatch [:navigate-back]) true) (do (dispatch [:navigate-back]) true)