fix multiple set view-id events dispatched (#19083)

src/status_im/core.cljs

@@ -21,6 +21,7 @@
     [status-im.contexts.profile.push-notifications.events :as notifications]
     [status-im.contexts.shell.jump-to.state :as shell.state]
     [status-im.contexts.shell.jump-to.utils :as shell.utils]
+    [status-im.navigation.core :as navigation]
     status-im.contexts.wallet.signals
     status-im.events
     status-im.navigation.core
@@ -44,7 +45,7 @@
 
 (defn init
   []
-
+  (navigation/init)
   (native-module/init #(re-frame/dispatch [:signals/signal-received %]))
   (when platform/android?
     (native-module/set-soft-input-mode adjust-resize))

src/status_im/navigation/core.cljs

@@ -11,15 +11,17 @@
     [status-im.navigation.view :as views]
     [utils.re-frame :as rf]))
 
-(navigation/set-lazy-component-registrator
+(defn init
+  []
+  (navigation/set-lazy-component-registrator
    (fn [screen-key]
      (let [screen (views/screen screen-key)]
        (navigation/register-component screen-key
                                       (fn [] (gesture/gesture-handler-root-hoc screen))
                                       (fn [] screen)))))
 
-;; APP LAUNCHED
-(navigation/reg-app-launched-listener
+  ;; APP LAUNCHED
+  (navigation/reg-app-launched-listener
    (fn []
      (navigation/set-default-options options/default-options)
      (reset! state/curr-modal false)
@@ -33,7 +35,7 @@
          (re-frame/dispatch [:chat/check-last-chat])))
      (rn/hide-splash-screen)))
 
-(navigation/reg-component-did-appear-listener
+  (navigation/reg-component-did-appear-listener
    (fn [view-id]
      (when (get views/screens view-id)
        ;;NOTE when back from the background on Android, this event happens for all screens, but we
@@ -44,9 +46,9 @@
          (effects/set-view-id view-id)
          (reset! state/pushed-screen-id view-id)))))
 
-;;;; Modal
+  ;;;; Modal
 
-(navigation/reg-button-pressed-listener
+  (navigation/reg-button-pressed-listener
    (fn [id]
      (if (= "dismiss-modal" id)
        (do
@@ -56,7 +58,7 @@
        (when-let [handler (get-in views/screens [(keyword id) :right-handler])]
          (handler)))))
 
-(navigation/reg-modal-dismissed-listener
+  (navigation/reg-modal-dismissed-listener
    (fn []
      (if (> (count @state/modals) 1)
        (let [new-modals (butlast @state/modals)]
@@ -72,9 +74,9 @@
        (when (keyword? component)
          (effects/open-modal component)))))
 
-;;;; Toast
+  ;;;; Toast
 
-(navigation/register-component
+  (navigation/register-component
    "toasts"
    ; `:flex 0` is the same as `flex: 0 0 auto` in CSS.
    ; We need this to override the HOC default layout which is
@@ -85,12 +87,12 @@
                                       #js {:flex 0})
    (fn [] views/toasts))
 
-;;;; Bottom sheet
+  ;;;; Bottom sheet
 
-(navigation/register-component
+  (navigation/register-component
    "bottom-sheet"
    (fn [] (gesture/gesture-handler-root-hoc views/bottom-sheet))
- (fn [] views/bottom-sheet))
+   (fn [] views/bottom-sheet)))
 
 ;; LEGACY (should be removed in status 2.0)
 

src/status_im/navigation/effects.cljs

@@ -129,12 +129,11 @@
 
 (defn open-modal
   [component]
-  (let [{:keys [options name]} (get views/screens component)
+  (let [{:keys [options]} (get views/screens component)
         sheet?            (:sheet? options)]
     (if @state/dissmissing
       (reset! state/dissmissing component)
       (do
-        (set-view-id name) ; TODO https://github.com/status-im/status-mobile/issues/18811
         (reset! state/curr-modal true)
         (swap! state/modals conj component)
         (navigation/show-modal