From 77b4dafe3e5ef19d54ef668e7226efc5409edd3e Mon Sep 17 00:00:00 2001 From: Goran Jovic Date: Wed, 3 Oct 2018 16:02:04 +0200 Subject: [PATCH] bug #5975 - navigating back to chat after chat initiated transaction Signed-off-by: Goran Jovic --- src/status_im/ui/screens/wallet/send/events.cljs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/status_im/ui/screens/wallet/send/events.cljs b/src/status_im/ui/screens/wallet/send/events.cljs index 83e3263257..41c381bd52 100644 --- a/src/status_im/ui/screens/wallet/send/events.cljs +++ b/src/status_im/ui/screens/wallet/send/events.cljs @@ -2,6 +2,7 @@ (:require [re-frame.core :as re-frame] [status-im.chat.commands.sending :as commands-sending] [status-im.chat.models.message :as models.message] + [status-im.chat.models :as chat.models] [status-im.constants :as constants] [status-im.i18n :as i18n] [status-im.models.transactions :as wallet.transactions] @@ -260,12 +261,17 @@ cofx) :dispatch [:wallet/update-gas-price true])))) +(fx/defn navigate-after-transaction [{:keys [db] :as cofx} chat-id] + (if (= :wallet-send-transaction-modal (second (:navigation-stack db))) + (chat.models/navigate-to-chat cofx chat-id {}) + (navigation/navigate-back cofx))) + (handlers/register-handler-fx :close-transaction-sent-screen - (fn [{:keys [db] :as cofx} [_ chat-id]] + (fn [cofx [_ chat-id]] (fx/merge cofx {:dispatch-later [{:ms 400 :dispatch [:check-dapps-transactions-queue]}]} - (navigation/navigate-back)))) + (navigate-after-transaction chat-id)))) (handlers/register-handler-fx :sync-wallet-transactions