Cancel back button on screens which can't be popped

status-im · Mar 17, 2020 · da88f08 · da88f08
1 parent bf2a167
commit da88f08
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 39 deletions.
diff --git a/src/status_im/ui/screens/routing/intro_login_stack.cljs b/src/status_im/ui/screens/routing/intro_login_stack.cljs
@@ -41,45 +41,61 @@
       {:name      :create-multiaccount-generate-key
        :options   {:stackPresentation "modal"}
        :component intro/wizard-generate-key}
-      {:name      :create-multiaccount-choose-key
-       :component intro/wizard-choose-key}
-      {:name      :create-multiaccount-select-key-storage
-       :component intro/wizard-select-key-storage}
-      {:name      :create-multiaccount-create-code
-       :component intro/wizard-create-code}
-      {:name      :create-multiaccount-confirm-code
-       :component intro/wizard-confirm-code}
-
+      {:name         :create-multiaccount-choose-key
+       :back-handler :noop
+       :component    intro/wizard-choose-key}
+      {:name         :create-multiaccount-select-key-storage
+       :back-handler :noop
+       :component    intro/wizard-select-key-storage}
+      {:name         :create-multiaccount-create-code
+       :back-handler :noop
+       :component    intro/wizard-create-code}
+      {:name         :create-multiaccount-confirm-code
+       :back-handler :noop
+       :component    intro/wizard-confirm-code}
       {:name      :recover-multiaccount-enter-phrase
        :component intro/wizard-enter-phrase}
-      {:name      :recover-multiaccount-select-storage
-       :component intro/wizard-select-key-storage}
-      {:name      :recover-multiaccount-enter-password
-       :component intro/wizard-create-code}
-      {:name      :recover-multiaccount-confirm-password
-       :component intro/wizard-confirm-code}
-      {:name      :recover-multiaccount-success
-       :component intro/wizard-recovery-success}
-      {:name      :keycard-onboarding-intro
-       :component keycard.onboarding/intro}
-      {:name      :keycard-onboarding-puk-code
-       :component keycard.onboarding/puk-code}
-      {:name      :keycard-onboarding-pin
-       :component keycard.onboarding/pin}
-      {:name      :keycard-onboarding-recovery-phrase
-       :component keycard.onboarding/recovery-phrase}
-      {:name      :keycard-onboarding-recovery-phrase-confirm-word1
-       :component keycard.onboarding/recovery-phrase-confirm-word}
-      {:name      :keycard-onboarding-recovery-phrase-confirm-word2
-       :component keycard.onboarding/recovery-phrase-confirm-word}
-      {:name      :keycard-recovery-intro
-       :component keycard.recovery/intro}
-      {:name      :keycard-recovery-pair
-       :component keycard.recovery/pair}
-      {:name      :keycard-recovery-success
-       :component keycard.recovery/success}
-      {:name      :keycard-recovery-no-key
-       :component keycard.recovery/no-key}
+      {:name         :recover-multiaccount-select-storage
+       :back-handler :noop
+       :component    intro/wizard-select-key-storage}
+      {:name         :recover-multiaccount-enter-password
+       :back-handler :noop
+       :component    intro/wizard-create-code}
+      {:name         :recover-multiaccount-confirm-password
+       :back-handler :noop
+       :component    intro/wizard-confirm-code}
+      {:name         :recover-multiaccount-success
+       :back-handler :noop
+       :component    intro/wizard-recovery-success}
+      {:name         :keycard-onboarding-intro
+       :back-handler :noop
+       :component    keycard.onboarding/intro}
+      {:name         :keycard-onboarding-puk-code
+       :back-handler :noop
+       :component    keycard.onboarding/puk-code}
+      {:name         :keycard-onboarding-pin
+       :back-handler :noop
+       :component    keycard.onboarding/pin}
+      {:name         :keycard-onboarding-recovery-phrase
+       :back-handler :noop
+       :component    keycard.onboarding/recovery-phrase}
+      {:name         :keycard-onboarding-recovery-phrase-confirm-word1
+       :back-handler :noop
+       :component    keycard.onboarding/recovery-phrase-confirm-word}
+      {:name         :keycard-onboarding-recovery-phrase-confirm-word2
+       :back-handler :noop
+       :component    keycard.onboarding/recovery-phrase-confirm-word}
+      {:name         :keycard-recovery-intro
+       :back-handler :noop
+       :component    keycard.recovery/intro}
+      {:name         :keycard-recovery-pair
+       :back-handler :noop
+       :component    keycard.recovery/pair}
+      {:name         :keycard-recovery-success
+       :back-handler :noop
+       :component    keycard.recovery/success}
+      {:name         :keycard-recovery-no-key
+       :component    keycard.recovery/no-key}
       {:name      :keycard-recovery-pin
        :component keycard.recovery/pin}
       {:name      :hardwallet-authentication-method

diff --git a/src/status_im/ui/screens/routing/main.cljs b/src/status_im/ui/screens/routing/main.cljs
@@ -61,8 +61,9 @@
        :component stickers/pack-modal}
       {:name      :tribute-learn-more
        :component tr-to-talk/learn-more}
-      {:name      :welcome
-       :component home/welcome}
+      {:name         :welcome
+       :back-handler :noop
+       :component    home/welcome}
       {:name       :new-chat
        :on-focus   [::new-chat.events/new-chat-focus]
        :transition :presentation-ios