diff --git a/src/status_im/multiaccounts/login/core.cljs b/src/status_im/multiaccounts/login/core.cljs index a13d213628..f1ce3f2d49 100644 --- a/src/status_im/multiaccounts/login/core.cljs +++ b/src/status_im/multiaccounts/login/core.cljs @@ -415,6 +415,11 @@ (when (= stored-key-uid key-uid) (re-frame/dispatch [:chat.ui/navigate-to-chat chat-id]))))))))) +(fx/defn check-last-chat + {:events [::check-last-chat]} + [{:keys [db]}] + {::open-last-chat (get-in db [:multiaccount :key-uid])}) + (fx/defn get-chats-callback {:events [::get-chats-callback]} [{:keys [db] :as cofx}] diff --git a/src/status_im/navigation/core.cljs b/src/status_im/navigation/core.cljs index 72dd4dfb47..239e33b721 100644 --- a/src/status_im/navigation/core.cljs +++ b/src/status_im/navigation/core.cljs @@ -13,7 +13,8 @@ [status-im.ui.screens.views :as views] [status-im.utils.fx :as fx] [status-im.utils.platform :as platform] - [taoensso.timbre :as log])) + [taoensso.timbre :as log] + [status-im.multiaccounts.login.core :as login-core])) (def debug? ^boolean js/goog.DEBUG) @@ -206,7 +207,8 @@ (re-frame/dispatch-sync [::set-multiaccount-root]) (when @root-id (reset! root-comp-id @root-id) - (.setRoot Navigation (clj->js (get (roots/roots) @root-id))))) + (.setRoot Navigation (clj->js (get (roots/roots) @root-id))) + (re-frame/dispatch [::login-core/check-last-chat]))) (.hide ^js splash-screen)))) (defn get-screen-component [comp]