fix root id of :init-root-fx (#15228)

2023-03-02 12:10:41 +05:30 · 2023-03-02 12:10:41 +05:30 · 78682b823b
parent 7d9709ee67
commit 78682b823b
1 changed files with 5 additions and 4 deletions
--- a/src/status_im2/navigation/core.cljs
+++ b/src/status_im2/navigation/core.cljs
@ -189,10 +189,11 @@
 (re-frame/reg-fx
 :init-root-fx
 (fn [new-root-id]
+   (let [root (get (roots/roots) new-root-id)]
     (log/debug :init-root-fx new-root-id)
     (dismiss-all-modals)
-   (reset! state/root-id new-root-id)
-   (navigation/set-root (get (roots/roots) new-root-id))))
+     (reset! state/root-id (or (get-in root [:root :stack :id]) new-root-id))
+     (navigation/set-root root))))

 (rf/defn set-multiaccount-root
  {:events [::set-multiaccount-root]}