From ad1a31073e0456618fdebb7de01f86c7632589ea Mon Sep 17 00:00:00 2001 From: Goran Jovic Date: Sat, 23 Jun 2018 10:48:08 +0200 Subject: [PATCH] bug #4917 and #4914 - not showing message in chat after wallet send Signed-off-by: Julien Eluard --- src/status_im/ui/screens/wallet/send/events.cljs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/status_im/ui/screens/wallet/send/events.cljs b/src/status_im/ui/screens/wallet/send/events.cljs index 76ab2aa1a0..875a0448d6 100644 --- a/src/status_im/ui/screens/wallet/send/events.cljs +++ b/src/status_im/ui/screens/wallet/send/events.cljs @@ -277,7 +277,7 @@ ::transaction-completed (fn [{db :db now :now} [_ {:keys [id response] :as params} modal?]] (let [{:keys [hash error]} response - {:keys [method]} (get-in db [:wallet :send-transaction]) + {:keys [method from-chat?]} (get-in db [:wallet :send-transaction]) db' (assoc-in db [:wallet :send-transaction :in-progress?] false)] (if (and error (string? error) (not (string/blank? error))) ;; ignore error here, error will be handled in :transaction-failed {:db db'} @@ -289,11 +289,17 @@ (update-in [:wallet :transactions-unsigned] dissoc id) true (update-in [:wallet :send-transaction] merge clear-send-properties {:tx-hash hash}))} - (if modal? + (cond + modal? (cond-> {:dispatch [:navigate-back]} (= method constants/web3-send-transaction) (assoc :dispatch-later [{:ms 400 :dispatch [:navigate-to-modal :wallet-transaction-sent-modal]}])) - {:dispatch [:execute-stored-command]})))))) + + from-chat? + {:dispatch [:execute-stored-command]} + + :else + {:dispatch [:navigation-replace :wallet-transaction-sent]})))))) (defn on-transactions-modal-completed [raw-results] (let [result (types/json->clj raw-results)]