From 71ff9d9035cec932979a663db5d5fc1c47df33ff Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 18 Jun 2018 14:39:13 +0300 Subject: [PATCH] [#4759] Handle back button properly after sending transaction (Android). --- src/status_im/android/core.cljs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/status_im/android/core.cljs b/src/status_im/android/core.cljs index ac69264003..0ee9e7f607 100644 --- a/src/status_im/android/core.cljs +++ b/src/status_im/android/core.cljs @@ -21,7 +21,8 @@ (let [stack (subscribe [:get :navigation-stack]) result-box (subscribe [:get-current-chat-ui-prop :result-box]) 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 (and @webview (:can-go-back? @result-box)) @@ -30,6 +31,9 @@ (#{:home :wallet :my-profile} view-id) (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)) (do (dispatch [:navigate-back]) true)