Onboarding readd biometric screen to syncing flow

Author: Parveshdhull

src/status_im/contexts/centralized_metrics/tracking.cljs

@@ -52,9 +52,6 @@
       (contains? view-ids-to-track view-id)
       (conj (navigation-event (name view-id)))
 
-      (= :screen/onboarding.syncing-results view-id)
-      (conj (key-value-event "onboarding-completed"))
-
       (= :screen/keycard.migrate.success view-id)
       (conj (key-value-event "keycard-migration-succeeded"))
 

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

@@ -6,7 +6,6 @@
     [status-im.common.biometric.utils :as biometric]
     [status-im.common.resources :as resources]
     [status-im.contexts.onboarding.enable-biometrics.style :as style]
-    [status-im.navigation.state :as state]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
@@ -25,8 +24,9 @@
         bio-type-label           (biometric/get-label-by-type supported-biometric-type)
         profile-color            (or (:color (rf/sub [:onboarding/profile]))
                                      (rf/sub [:profile/customization-color]))
-        syncing-results?         (= :screen/onboarding.syncing-results @state/root-id)
-        biometric-type           (rf/sub [:biometrics/supported-type])]
+        biometric-type           (rf/sub [:biometrics/supported-type])
+        syncing?                 (rf/sub [:onboarding/syncing-connection-string?])]
+    (print "---------" syncing?)
     [rn/view {:style (style/buttons insets)}
      [quo/button
       {:size                40
@@ -39,10 +39,8 @@
       {:accessibility-label :maybe-later-button
        :background          :blur
        :type                :grey
-       :on-press            #(rf/dispatch (if syncing-results?
-                                            [:navigate-to-within-stack
-                                             [:screen/onboarding.enable-notifications
-                                              :screen/onboarding.enable-biometrics]]
+       :on-press            #(rf/dispatch (if syncing?
+                                            [:syncing/initiate-local-pairing-with-connection-string]
                                             [:onboarding/create-account-and-login]))
        :container-style     {:margin-top 12}}
       (i18n/label :t/maybe-later)]]))

src/status_im/contexts/onboarding/events.cljs

@@ -38,12 +38,6 @@
  (fn [{:keys [db]}]
    {:db (dissoc db :onboarding/navigated-to-enter-seed-phrase-from-screen)}))
 
-(rf/reg-event-fx :onboarding/navigate-to-enable-notifications-from-syncing
- (fn [{:keys [db]}]
-   {:db       (dissoc db :onboarding/profile)
-    :dispatch [:navigate-to-within-stack
-               [:screen/onboarding.enable-notifications :screen/onboarding.enable-biometrics]]}))
-
 (rf/reg-event-fx :onboarding/navigate-to-enable-notifications
  (fn [{:keys [db]}]
    {:dispatch [:navigate-to-within-stack
@@ -55,10 +49,10 @@
 (rf/defn biometrics-done
   {:events [:onboarding/biometrics-done]}
   [{:keys [db]}]
-  (let [syncing? (get-in db [:onboarding/profile :syncing?])]
+  (let [syncing? (get-in db [:onboarding/profile :connection-string])]
     {:db       (assoc-in db [:onboarding/profile :auth-method] constants/auth-method-biometric)
      :dispatch (if syncing?
-                 [:onboarding/finalize-setup]
+                 [:syncing/initiate-local-pairing-with-stored-connection-string]
                  [:onboarding/create-account-and-login])}))
 
 (rf/reg-event-fx
@@ -107,20 +101,13 @@
                                        :screen/onboarding.create-profile)]
      {:db (-> db
               (assoc-in [:onboarding/profile :password] masked-password)
+              (update-in [:onboarding/profile] dissoc :connection-string)
               (assoc-in [:onboarding/profile :auth-method] constants/auth-method-password))
       :fx [[:dispatch
             (if biometric-supported-type
               [:navigate-to-within-stack [:screen/onboarding.enable-biometrics from-screen]]
               [:onboarding/create-account-and-login])]]})))
 
-(rf/reg-event-fx
- :onboarding/navigate-to-enable-biometrics
- (fn [{:keys [db]}]
-   (let [supported-type (get-in db [:biometrics :supported-type])]
-     {:dispatch (if supported-type
-                  [:open-modal :screen/onboarding.enable-biometrics]
-                  [:open-modal :screen/onboarding.enable-notifications])})))
-
 (rf/reg-event-fx
  :onboarding/seed-phrase-validated
  (fn [{:keys [db]} [seed-phrase key-uid]]
@@ -187,7 +174,10 @@
                  temporary-display-name?]} (:onboarding/profile db)
          {:keys [key-uid] :as profile}     (:profile/profile db)
          biometric-enabled?                (= auth-method constants/auth-method-biometric)]
-     {:db (assoc db :onboarding/generated-keys? true)
+     (print "----------------" password)
+     {:db (-> db
+              (assoc :onboarding/generated-keys? true)
+              (dissoc :onboarding/profile))
       :fx [(when temporary-display-name?
              [:dispatch [:profile/set-default-profile-name profile]])
            (when biometric-enabled?
@@ -196,11 +186,7 @@
                :masked-password (if syncing?
                                   password
                                   (security/hash-masked-password password))
-               :on-success      (fn []
-                                  (rf/dispatch [:onboarding/set-auth-method auth-method])
-                                  (when syncing?
-                                    (rf/dispatch
-                                     [:onboarding/navigate-to-enable-notifications-from-syncing])))
+               :on-success      [:onboarding/set-auth-method auth-method]
                :on-error        #(log/error "failed to save biometrics"
                                             {:key-uid key-uid
                                              :error   %})}])]})))

src/status_im/contexts/onboarding/syncing/progress/view.cljs

@@ -41,24 +41,25 @@
 
 (defn try-again-button
   [profile-color logged-in?]
-  [quo/bottom-actions
-   {:actions (if logged-in? :one-action :two-vertical-actions)
-    :blur? true
-    :container-style {:height (when-not logged-in? 116)}
-    :button-two-label (i18n/label :t/use-recovery-phrase)
-    :button-two-props {:type                :primary
-                       :accessibility-label :try-seed-phrase-button
-                       :customization-color profile-color
-                       :size                40
-                       :on-press            navigate-to-enter-seed-phrase}
-    :button-one-label
-    (i18n/label :t/try-again)
-    :button-one-props
-    {:type                (if logged-in? :primary :grey)
-     :accessibility-label :try-again-later-button
-     :customization-color profile-color
-     :size                40
-     :on-press            #(try-again logged-in?)}}])
+  (let [two-vertical-actions-height 116]
+    [quo/bottom-actions
+     {:actions (if logged-in? :one-action :two-vertical-actions)
+      :blur? true
+      :container-style {:height (when-not logged-in? two-vertical-actions-height)}
+      :button-two-label (i18n/label :t/use-recovery-phrase)
+      :button-two-props {:type                :primary
+                         :accessibility-label :try-seed-phrase-button
+                         :customization-color profile-color
+                         :size                40
+                         :on-press            navigate-to-enter-seed-phrase}
+      :button-one-label
+      (i18n/label :t/try-again)
+      :button-one-props
+      {:type                (if logged-in? :primary :grey)
+       :accessibility-label :try-again-later-button
+       :customization-color profile-color
+       :size                40
+       :on-press            #(try-again logged-in?)}}]))
 
 (defn- illustration
   [pairing-progress?]

src/status_im/contexts/onboarding/syncing/results/style.cljs

@@ -81,10 +81,7 @@
                  (when keycard?
                    [:dispatch [:centralized-metrics/track :metric/keycard-login]])]
                 (cond
-                  pairing-completed?
-                  [[:dispatch [:onboarding/finish-onboarding false]]]
-
-                  (get db :onboarding/new-account?)
+                  (or pairing-completed? (get db :onboarding/new-account?))
                   [[:dispatch [:onboarding/finalize-setup]]
                    [:dispatch [:onboarding/finish-onboarding false]]]
 

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

@@ -58,19 +58,19 @@
                                       (reset! sync-code-value nil))}
               [quo/icon :i/clear style/clear-icon]])]]
          [quo/button
-          {:type                :primary
-           :disabled?           (string/blank? @sync-code-value)
+          {:type :primary
+           :disabled? (string/blank? @sync-code-value)
            :customization-color profile-color
-           :container-style     style/continue-button-container
-           :on-press            (fn [_]
-                                  (if (sync-utils/valid-connection-string? @sync-code-value)
-                                    (debounce/debounce-and-dispatch
-                                     [:syncing/input-connection-string-for-bootstrapping
-                                      @sync-code-value]
-                                     300)
-                                    (rf/dispatch [:toasts/upsert
-                                                  {:type  :negative
-                                                   :theme :dark
-                                                   :text  (i18n/label
-                                                           :t/error-this-is-not-a-sync-qr-code)}])))}
+           :container-style style/continue-button-container
+           :on-press (fn [_]
+                       (if (sync-utils/valid-connection-string? @sync-code-value)
+                         (debounce/debounce-and-dispatch
+                          [:syncing/store-local-pairing-connection-string-and-navigate-to-biometric
+                           @sync-code-value]
+                          300)
+                         (rf/dispatch [:toasts/upsert
+                                       {:type  :negative
+                                        :theme :dark
+                                        :text  (i18n/label
+                                                :t/error-this-is-not-a-sync-qr-code)}])))}
           (i18n/label :t/confirm)]]))))

src/status_im/contexts/profile/login/events.cljs

@@ -25,9 +25,9 @@
 
 (defn- input-connection-string-callback
   [res]
-  (log/info "[local-pairing] input-connection-string-for-bootstrapping callback"
+  (log/info "[local-pairing] initiate-local-pairing-with-stored-connection-string callback"
             {:response res
-             :event    :syncing/input-connection-string-for-bootstrapping})
+             :event    :syncing/initiate-local-pairing-with-stored-connection-string})
   (let [response        (transforms/json->clj res)
         installation-id (:installationId response)
         key-uid         (:keyUID response)
@@ -93,6 +93,15 @@
      config-map
      input-connection-string-callback)))
 
+(rf/reg-event-fx
+ :syncing/store-local-pairing-connection-string-and-navigate-to-biometric
+ (fn [{:keys [db]} [connection-string]]
+   {:db (assoc-in db [:onboarding/profile :connection-string] connection-string)
+    :dispatch
+    (if (get-in db [:biometrics :supported-type])
+      [:navigate-to-within-stack [:screen/onboarding.enable-biometrics :screen/onboarding.log-in]]
+      [:syncing/initiate-local-pairing-with-stored-connection-string])}))
+
 (rf/defn preparations-for-connection-string
   {:events [:syncing/get-connection-string]}
   [{:keys [db]} sha3-pwd on-valid-connection-string]

src/status_im/contexts/syncing/enter_sync_code/view.cljs

@@ -225,7 +225,7 @@
       (do
         (on-success-scan)
         (debounce/debounce-and-dispatch
-         [:syncing/input-connection-string-for-bootstrapping connection-string]
+         [:syncing/store-local-pairing-connection-string-and-navigate-to-biometric connection-string]
          300))
       (do
         (on-failed-scan)

src/status_im/contexts/syncing/events.cljs

@@ -24,12 +24,7 @@
     {:stack {:id       :screen/profile.profiles
              :children [{:component {:name    :screen/profile.profiles
                                      :id      :screen/profile.profiles
-                                     :options (options/dark-root-options)}}]}}}
-
-   :screen/onboarding.syncing-results
-   {:root {:stack {:children [{:component {:name    :screen/onboarding.syncing-results
-                                           :id      :screen/onboarding.syncing-results
-                                           :options (options/dark-root-options)}}]}}}})
+                                     :options (options/dark-root-options)}}]}}}})
 
 (defn old-roots
   [status-bar-theme]