added navigate to biometric screen after sign-in by syncing

Author: jo-mut

src/status_im2/contexts/onboarding/enable_biometrics/view.cljs

@@ -8,6 +8,7 @@
     [status-im2.common.parallax.whitelist :as whitelist]
     [status-im2.common.resources :as resources]
     [status-im2.contexts.onboarding.enable-biometrics.style :as style]
+    [status-im2.navigation.state :as state]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -24,7 +25,8 @@
   [insets]
   (let [supported-biometric-type (rf/sub [:biometric/supported-type])
         bio-type-label           (biometric/get-label-by-type supported-biometric-type)
-        profile-color            (:color (rf/sub [:onboarding-2/profile]))]
+        profile-color            (or (:color (rf/sub [:onboarding-2/profile]))
+                                     (rf/sub [:profile/customization-color]))]
     [rn/view {:style (style/buttons insets)}
      [quo/button
       {:accessibility-label :enable-biometrics-button
@@ -36,16 +38,17 @@
       {:accessibility-label :maybe-later-button
        :background          :blur
        :type                :grey
-       :on-press            #(rf/dispatch [:onboarding-2/create-account-and-login])
-       :container-style     {:margin-top 12}}
-      (i18n/label :t/maybe-later)]]))
+       :on-press            #(rf/dispatch (if (= :syncing-results @state/root-id)
+                                            [:navigate-to-within-stack
+                                             [:enable-notifications :enable-biometrics]]
+                                            [:onboarding-2/create-account-and-login]))
+       :container-style     {:margin-top 12}} (i18n/label :t/maybe-later)]]))
 
 (defn enable-biometrics-parallax
   []
   (let [stretch (if rn/small-screen? 25 40)]
     [parallax/video
-     {:layers  (:biometrics resources/parallax-video)
-      :stretch stretch}]))
+     {:layers (:biometrics resources/parallax-video) :stretch stretch}]))
 
 (defn enable-biometrics-simple
   []
@@ -58,9 +61,7 @@
 (defn enable-biometrics
   []
   (let [insets (safe-area/get-insets)]
-    [rn/view {:style (style/page-container insets)}
-     [page-title]
+    [rn/view {:style (style/page-container insets)} [page-title]
      (if whitelist/whitelisted?
        [enable-biometrics-parallax]
-       [enable-biometrics-simple])
-     [enable-biometrics-buttons insets]]))
+       [enable-biometrics-simple]) [enable-biometrics-buttons insets]]))

src/status_im2/contexts/onboarding/enable_notifications/view.cljs

@@ -1,13 +1,13 @@
 (ns status-im2.contexts.onboarding.enable-notifications.view
   (:require
-    [quo.core :as quo]
-    [react-native.core :as rn]
-    [react-native.platform :as platform]
-    [react-native.safe-area :as safe-area]
-    [status-im2.contexts.onboarding.enable-notifications.style :as style]
-    [status-im2.contexts.shell.jump-to.utils :as shell.utils]
-    [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
+   [quo.core :as quo]
+   [react-native.core :as rn]
+   [react-native.platform :as platform]
+   [react-native.safe-area :as safe-area]
+   [status-im2.contexts.onboarding.enable-notifications.style :as style]
+   [status-im2.contexts.shell.jump-to.utils :as shell.utils]
+   [utils.i18n :as i18n]
+   [utils.re-frame :as rf]))
 
 (defn page-title
   []
@@ -51,7 +51,7 @@
      [quo/page-nav
       {:background :blur
        :icon-name  :i/arrow-left
-       :on-press   #(rf/dispatch [:navigate-back-within-stack :new-to-status])}]
+       :on-press   #(rf/dispatch [:navigate-back-within-stack :enable-biometrics])}]
      [page-title]
      [rn/view {:style style/page-illustration}
       [quo/text

src/status_im2/contexts/onboarding/events.cljs

@@ -6,6 +6,7 @@
     [status-im2.constants :as constants]
     [status-im2.contexts.profile.create.events :as profile.create]
     [status-im2.contexts.profile.recover.events :as profile.recover]
+    [status-im2.navigation.state :as state]
     [taoensso.timbre :as log]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]
@@ -39,7 +40,9 @@
   {:events [:onboarding-2/biometrics-done]}
   [{:keys [db]}]
   {:db       (assoc-in db [:onboarding-2/profile :auth-method] constants/auth-method-biometric)
-   :dispatch [:onboarding-2/create-account-and-login]})
+   :dispatch (if (= :syncing-results @state/root-id)
+               [:navigate-to-within-stack [:enable-notifications :enable-biometrics]]
+               [:onboarding-2/create-account-and-login])})
 
 (rf/defn biometrics-fail
   {:events [:onboarding-2/biometrics-fail]}
@@ -83,6 +86,14 @@
                  [:navigate-to-within-stack [:enable-biometrics :new-to-status]]
                  [:onboarding-2/create-account-and-login])}))
 
+(rf/defn navigate-to-enable-biometrics
+  {:events [:onboarding-2/navigate-to-enable-biometrics]}
+  [{:keys [db]}]
+  (let [supported-type (:biometric/supported-type db)]
+    {:dispatch (if supported-type
+                 [:open-modal :enable-biometrics]
+                 [:open-modal :enable-notifications])}))
+
 (rf/defn seed-phrase-entered
   {:events [:onboarding-2/seed-phrase-entered]}
   [_ seed-phrase on-error]

src/status_im2/contexts/onboarding/syncing/results/view.cljs

@@ -54,7 +54,7 @@
      {:on-press            (fn []
                              (when on-press
                                (on-press))
-                             (rf/dispatch [:open-modal :enable-notifications]))
+                             (rf/dispatch [:onboarding-2/navigate-to-enable-biometrics]))
       :accessibility-label :continue-button
       :customization-color profile-color
       :container-style     style/continue-button}

src/status_im2/navigation/screens.cljs

@@ -157,10 +157,12 @@
      :component create-password/create-password}
 
     {:name      :enable-biometrics
-     :options   {:theme      :dark
-                 :layout     options/onboarding-transparent-layout
-                 :animations transitions/push-animations-for-transparent-background
-                 :popGesture false}
+     :options   {:theme                  :dark
+                 :layout                 options/onboarding-transparent-layout
+                 :animations             (merge transitions/new-to-status-modal-animations
+                                                transitions/push-animations-for-transparent-background)
+                 :popGesture             false
+                 :modalPresentationStyle :overCurrentContext}
      :component enable-biometrics/enable-biometrics}
 
     {:name      :generating-keys