status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(onboarding): qualify screen keywords (#19285)

This commit is contained in:
Jamie Caprani 2024-03-26 14:06:43 +00:00 committed by GitHub
parent c86cdf9ac8
commit bcf8e39e84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 103 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/legacy/status_im/keycard/login.cljs
View File

@ -18,7 +18,7 @@
[{:keys [db] :as cofx}] [{:keys [db] :as cofx}]
(rf/merge cofx (rf/merge cofx
{:db db} {:db db}
(navigation/pop-to-root :profiles))) (navigation/pop-to-root :screen/profile.profiles)))
(rf/defn login-pin-more-icon-pressed (rf/defn login-pin-more-icon-pressed
{:events [:keycard.login.pin.ui/more-icon-pressed]} {:events [:keycard.login.pin.ui/more-icon-pressed]}

5
src/legacy/status_im/keycard/recovery.cljs
View File

@ -74,7 +74,8 @@
(assoc :recovered-account? true)) (assoc :recovered-account? true))
:keycard/check-nfc-enabled nil} :keycard/check-nfc-enabled nil}
(bottom-sheet/hide-bottom-sheet-old) (bottom-sheet/hide-bottom-sheet-old)
(navigation/navigate-to-within-stack [:keycard-recovery-intro :new-to-status]))) (navigation/navigate-to-within-stack [:keycard-recovery-intro
:screen/onboarding.new-to-status])))
(rf/defn access-key-pressed (rf/defn access-key-pressed
{:events [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]} {:events [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]}
@ -127,7 +128,7 @@
:multiaccount-whisper-public-key)} :multiaccount-whisper-public-key)}
(navigation/navigate-to (if platform/android? (navigation/navigate-to (if platform/android?
:notifications-settings :notifications-settings
:welcome) :screen/onboarding.welcome)
nil))) nil)))
(rf/defn intro-wizard (rf/defn intro-wizard

13
src/status_im/common/pairing/events.cljs
View File

@ -32,10 +32,10 @@
multiaccount-data (when received-account? multiaccount-data (when received-account?
(merge account {:password password})) (merge account {:password password}))
navigate-to-syncing-devices? (and (or connection-success? connection-error?) receiver?) navigate-to-syncing-devices? (and (or connection-success? connection-error?) receiver?)
user-in-syncing-devices-screen? (or (= (:view-id db) :syncing-progress) user-in-syncing-devices-screen? (or (= (:view-id db) :screen/onboarding.syncing-progress)
(= (:view-id db) :profiles) (= (:view-id db) :screen/profile.profiles)
(= (:view-id db) :syncing-progress-intro)) (= (:view-id db) :screen/onboarding.syncing-progress-intro))
user-in-sign-in-intro-screen? (= (:view-id db) :sign-in-intro)] user-in-sign-in-intro-screen? (= (:view-id db) :screen/onboarding.sign-in-intro)]
(merge {:db (cond-> db (merge {:db (cond-> db
connection-success? connection-success?
(assoc-in [:syncing :pairing-status] :connected) (assoc-in [:syncing :pairing-status] :connected)
@ -51,8 +51,9 @@
(cond (cond
(and navigate-to-syncing-devices? (not user-in-syncing-devices-screen?)) (and navigate-to-syncing-devices? (not user-in-syncing-devices-screen?))
{:dispatch (if user-in-sign-in-intro-screen? {:dispatch (if user-in-sign-in-intro-screen?
[:navigate-to-within-stack [:syncing-progress-intro :sign-in-intro]] [:navigate-to-within-stack
[:navigate-to :syncing-progress])} [:screen/onboarding.syncing-progress-intro :screen/onboarding.sign-in-intro]]
[:navigate-to :screen/onboarding.syncing-progress])}
(and completed-pairing? sender?) (and completed-pairing? sender?)
{:dispatch [:syncing/clear-states]} {:dispatch [:syncing/clear-states]}

4
src/status_im/contexts/onboarding/common/background/view.cljs
View File

@ -69,9 +69,9 @@
(rn/use-effect (rn/use-effect
(fn [] (fn []
(reanimated/set-shared-value @paused? (not= view-id :intro)) (reanimated/set-shared-value @paused? (not= view-id :screen/onboarding.intro))
(fn [] (fn []
(when (= view-id :generating-keys) (when (= view-id :screen/onboarding.generating-keys)
(carousel.animation/cleanup-animation progress paused?)))) (carousel.animation/cleanup-animation progress paused?))))
[view-id]) [view-id])

5
src/status_im/contexts/onboarding/enable_biometrics/view.cljs
View File

@ -28,7 +28,7 @@
bio-type-label (biometric/get-label-by-type supported-biometric-type) bio-type-label (biometric/get-label-by-type supported-biometric-type)
profile-color (or (:color (rf/sub [:onboarding/profile])) profile-color (or (:color (rf/sub [:onboarding/profile]))
(rf/sub [:profile/customization-color])) (rf/sub [:profile/customization-color]))
syncing-results? (= :syncing-results @state/root-id)] syncing-results? (= :screen/onboarding.syncing-results @state/root-id)]
[rn/view {:style (style/buttons insets)} [rn/view {:style (style/buttons insets)}
[quo/button [quo/button
{:size 40 {:size 40
@ -43,7 +43,8 @@
:type :grey :type :grey
:on-press #(rf/dispatch (if syncing-results? :on-press #(rf/dispatch (if syncing-results?
[:navigate-to-within-stack [:navigate-to-within-stack
[:enable-notifications :enable-biometrics]] [:screen/onboarding.enable-notifications
:screen/onboarding.enable-biometrics]]
[:onboarding/create-account-and-login])) [:onboarding/create-account-and-login]))
:container-style {:margin-top 12}} :container-style {:margin-top 12}}
(i18n/label :t/maybe-later)]])) (i18n/label :t/maybe-later)]]))

6
src/status_im/contexts/onboarding/enable_notifications/view.cljs
View File

@ -36,7 +36,8 @@
:on-denied #(log/error "user denied push notification permissions")}]) :on-denied #(log/error "user denied push notification permissions")}])
(rf/dispatch [:push-notifications/switch true platform/ios?]) (rf/dispatch [:push-notifications/switch true platform/ios?])
(rf/dispatch [:navigate-to-within-stack (rf/dispatch [:navigate-to-within-stack
[:welcome :enable-notifications]])) [:screen/onboarding.welcome
:screen/onboarding.enable-notifications]]))
:type :primary :type :primary
:icon-left :i/notifications :icon-left :i/notifications
:accessibility-label :enable-notifications-button :accessibility-label :enable-notifications-button
@ -46,7 +47,8 @@
{:on-press (fn [] {:on-press (fn []
(shell.utils/change-selected-stack-id :communities-stack true nil) (shell.utils/change-selected-stack-id :communities-stack true nil)
(rf/dispatch [:navigate-to-within-stack (rf/dispatch [:navigate-to-within-stack
[:welcome :enable-notifications]])) [:screen/onboarding.welcome
:screen/onboarding.enable-notifications]]))
:accessibility-label :enable-notifications-later-button :accessibility-label :enable-notifications-later-button
:type :grey :type :grey
:background :blur :background :blur

29
src/status_im/contexts/onboarding/events.cljs
View File

@ -27,7 +27,8 @@
{:events [:onboarding/profile-data-set]} {:events [:onboarding/profile-data-set]}
[{:keys [db]} onboarding-data] [{:keys [db]} onboarding-data]
{:db (update db :onboarding/profile merge onboarding-data) {:db (update db :onboarding/profile merge onboarding-data)
:dispatch [:navigate-to-within-stack [:create-profile-password :new-to-status]]}) :dispatch [:navigate-to-within-stack
[:screen/onboarding.create-profile-password :screen/onboarding.new-to-status]]})
(rf/defn enable-biometrics (rf/defn enable-biometrics
{:events [:onboarding/enable-biometrics]} {:events [:onboarding/enable-biometrics]}
@ -42,7 +43,8 @@
[{:keys [db]}] [{:keys [db]}]
(let [key-uid (get-in db [:profile/profile :key-uid])] (let [key-uid (get-in db [:profile/profile :key-uid])]
{:db (dissoc db :onboarding/profile) {:db (dissoc db :onboarding/profile)
:dispatch [:navigate-to-within-stack [:enable-notifications :enable-biometrics]]})) :dispatch [:navigate-to-within-stack
[:screen/onboarding.enable-notifications :screen/onboarding.enable-biometrics]]}))
(rf/defn biometrics-done (rf/defn biometrics-done
{:events [:onboarding/biometrics-done]} {:events [:onboarding/biometrics-done]}
@ -64,7 +66,8 @@
(let [{:keys [display-name seed-phrase password image-path color] :as profile} (let [{:keys [display-name seed-phrase password image-path color] :as profile}
(:onboarding/profile db)] (:onboarding/profile db)]
(rf/merge cofx (rf/merge cofx
{:dispatch [:navigate-to-within-stack [:generating-keys :new-to-status]] {:dispatch [:navigate-to-within-stack
[:screen/onboarding.generating-keys :screen/onboarding.new-to-status]]
:dispatch-later [{:ms constants/onboarding-generating-keys-animation-duration-ms :dispatch-later [{:ms constants/onboarding-generating-keys-animation-duration-ms
:dispatch [:onboarding/navigate-to-identifiers]}] :dispatch [:onboarding/navigate-to-identifiers]}]
:db (-> db :db (-> db
@ -82,7 +85,7 @@
(merge (merge
{:db (assoc db :profile/profiles-overview multiaccounts)} {:db (assoc db :profile/profiles-overview multiaccounts)}
(when-not (seq multiaccounts) (when-not (seq multiaccounts)
{:set-root :intro})))) {:set-root :screen/onboarding.intro}))))
(rf/defn password-set (rf/defn password-set
{:events [:onboarding/password-set]} {:events [:onboarding/password-set]}
@ -92,7 +95,8 @@
(assoc-in [:onboarding/profile :password] password) (assoc-in [:onboarding/profile :password] password)
(assoc-in [:onboarding/profile :auth-method] constants/auth-method-password)) (assoc-in [:onboarding/profile :auth-method] constants/auth-method-password))
:dispatch (if supported-type :dispatch (if supported-type
[:navigate-to-within-stack [:enable-biometrics :new-to-status]] [:navigate-to-within-stack
[:screen/onboarding.enable-biometrics :screen/onboarding.new-to-status]]
[:onboarding/create-account-and-login])})) [:onboarding/create-account-and-login])}))
(rf/defn navigate-to-enable-biometrics (rf/defn navigate-to-enable-biometrics
@ -100,8 +104,8 @@
[{:keys [db]}] [{:keys [db]}]
(let [supported-type (get-in db [:biometrics :supported-type])] (let [supported-type (get-in db [:biometrics :supported-type])]
{:dispatch (if supported-type {:dispatch (if supported-type
[:open-modal :enable-biometrics] [:open-modal :screen/onboarding.enable-biometrics]
[:open-modal :enable-notifications])})) [:open-modal :screen/onboarding.enable-notifications])}))
(rf/defn seed-phrase-entered (rf/defn seed-phrase-entered
{:events [:onboarding/seed-phrase-entered]} {:events [:onboarding/seed-phrase-entered]}
@ -121,19 +125,21 @@
:content (i18n/label :t/multiaccount-exists-content) :content (i18n/label :t/multiaccount-exists-content)
:confirm-button-text (i18n/label :t/unlock) :confirm-button-text (i18n/label :t/unlock)
:on-accept (fn [] :on-accept (fn []
(re-frame/dispatch [:pop-to-root :profiles]) (re-frame/dispatch [:pop-to-root :screen/profile.profiles])
(re-frame/dispatch (re-frame/dispatch
[:profile/profile-selected key-uid])) [:profile/profile-selected key-uid]))
:on-cancel #(re-frame/dispatch [:pop-to-root :multiaccounts])}} :on-cancel #(re-frame/dispatch [:pop-to-root :multiaccounts])}}
{:db (assoc-in db [:onboarding/profile :seed-phrase] seed-phrase) {:db (assoc-in db [:onboarding/profile :seed-phrase] seed-phrase)
:dispatch [:navigate-to-within-stack [:create-profile :new-to-status]]})) :dispatch [:navigate-to-within-stack
[:screen/onboarding.create-profile :screen/onboarding.new-to-status]]}))
(rf/defn navigate-to-create-profile (rf/defn navigate-to-create-profile
{:events [:onboarding/navigate-to-create-profile]} {:events [:onboarding/navigate-to-create-profile]}
[{:keys [db]}] [{:keys [db]}]
;; Restart the flow ;; Restart the flow
{:db (dissoc db :onboarding/profile) {:db (dissoc db :onboarding/profile)
:dispatch [:navigate-to-within-stack [:create-profile :new-to-status]]}) :dispatch [:navigate-to-within-stack
[:screen/onboarding.create-profile :screen/onboarding.new-to-status]]})
(rf/reg-event-fx :onboarding/set-auth-method (rf/reg-event-fx :onboarding/set-auth-method
(fn [{:keys [db]} [auth-method]] (fn [{:keys [db]} [auth-method]]
@ -167,6 +173,7 @@
{:events [:onboarding/navigate-to-identifiers]} {:events [:onboarding/navigate-to-identifiers]}
[{:keys [db]}] [{:keys [db]}]
(if (:onboarding/generated-keys? db) (if (:onboarding/generated-keys? db)
{:dispatch [:navigate-to-within-stack [:identifiers :new-to-status]]} {:dispatch [:navigate-to-within-stack
[:screen/onboarding.identifiers :screen/onboarding.new-to-status]]}
{:dispatch-later [{:ms constants/onboarding-generating-keys-navigation-retry-ms {:dispatch-later [{:ms constants/onboarding-generating-keys-navigation-retry-ms
:dispatch [:onboarding/navigate-to-identifiers]}]})) :dispatch [:onboarding/navigate-to-identifiers]}]}))

3
src/status_im/contexts/onboarding/identifiers/view.cljs
View File

@ -63,7 +63,8 @@
:type :grey :type :grey
:background :blur :background :blur
:on-press #(rf/dispatch [:navigate-to-within-stack :on-press #(rf/dispatch [:navigate-to-within-stack
[:enable-notifications :new-to-status]]) [:screen/onboarding.enable-notifications
:screen/onboarding.new-to-status]])
:container-style style/button} :container-style style/button}
(i18n/label :t/continue)]]]])) (i18n/label :t/continue)]]]]))

7
src/status_im/contexts/onboarding/intro/view.cljs
View File

@ -19,8 +19,9 @@
(reset! scan-sync-code/dismiss-animations reset-top-animation-fn)) (reset! scan-sync-code/dismiss-animations reset-top-animation-fn))
:animations-duration constants/onboarding-modal-animation-duration :animations-duration constants/onboarding-modal-animation-duration
:animations-delay constants/onboarding-modal-animation-delay :animations-delay constants/onboarding-modal-animation-delay
:top-card {:on-press #(debounce/throttle-and-dispatch [:open-modal :top-card {:on-press #(debounce/throttle-and-dispatch
:sign-in-intro] [:open-modal
:screen/onboarding.sign-in-intro]
2000) 2000)
:heading (i18n/label :t/sign-in) :heading (i18n/label :t/sign-in)
:animated-heading (i18n/label :t/sign-in-by-syncing) :animated-heading (i18n/label :t/sign-in-by-syncing)
@ -29,7 +30,7 @@
(when-let [blur-show-fn @overlay/blur-show-fn-atom] (when-let [blur-show-fn @overlay/blur-show-fn-atom]
(blur-show-fn)) (blur-show-fn))
(debounce/throttle-and-dispatch (debounce/throttle-and-dispatch
[:open-modal :new-to-status] [:open-modal :screen/onboarding.new-to-status]
1000)) 1000))
:heading (i18n/label :t/new-to-status) :heading (i18n/label :t/new-to-status)
:accessibility-label :new-to-status-button}} :accessibility-label :new-to-status-button}}

4
src/status_im/contexts/onboarding/new_to_status/view.cljs
View File

@ -45,7 +45,9 @@
:title (i18n/label :t/use-recovery-phrase) :title (i18n/label :t/use-recovery-phrase)
:subtitle (i18n/label :t/use-recovery-phrase-subtitle) :subtitle (i18n/label :t/use-recovery-phrase-subtitle)
:image (resources/get-image :ethereum-address) :image (resources/get-image :ethereum-address)
:on-press #(rf/dispatch [:navigate-to-within-stack [:enter-seed-phrase :new-to-status]])}] :on-press #(rf/dispatch [:navigate-to-within-stack
[:screen/onboarding.enter-seed-phrase
:screen/onboarding.new-to-status]])}]
[rn/view {:style style/space-between-suboptions}] [rn/view {:style style/space-between-suboptions}]
[quo/small-option-card [quo/small-option-card
{:variant :icon {:variant :icon

7
src/status_im/contexts/onboarding/syncing/progress/view.cljs
View File

@ -32,10 +32,13 @@
(rf/dispatch [:syncing/clear-states]) (rf/dispatch [:syncing/clear-states])
(cond (cond
logged-in? (rf/dispatch [:navigate-back]) logged-in? (rf/dispatch [:navigate-back])
in-onboarding? (rf/dispatch [:navigate-back-to :sign-in-intro]) in-onboarding? (rf/dispatch [:navigate-back-to
:screen/onboarding.sign-in-intro])
:else (do :else (do
(rf/dispatch [:navigate-back]) (rf/dispatch [:navigate-back])
(debounce/throttle-and-dispatch [:open-modal :sign-in] (debounce/throttle-and-dispatch
[:open-modal
:screen/onboarding.sign-in]
1000)))) 1000))))
:accessibility-label :try-again-later-button :accessibility-label :try-again-later-button
:customization-color profile-color :customization-color profile-color

2
src/status_im/contexts/preview/quo/common.cljs
View File

@ -9,7 +9,7 @@
[{:keys [theme title]}] [{:keys [theme title]}]
(let [logged-in? (rf/sub [:multiaccount/logged-in?]) (let [logged-in? (rf/sub [:multiaccount/logged-in?])
has-profiles? (boolean (rf/sub [:profile/profiles-overview])) has-profiles? (boolean (rf/sub [:profile/profiles-overview]))
root (if has-profiles? :profiles :intro) root (if has-profiles? :screen/profile.profiles :screen/onboarding.intro)
light? (= theme :light)] light? (= theme :light)]
[quo/page-nav [quo/page-nav
{:type :title {:type :title

4
src/status_im/contexts/profile/events.cljs
View File

@ -45,14 +45,14 @@
(assoc :profile/profiles-overview profiles) (assoc :profile/profiles-overview profiles)
(update :profile/login #(select-profile % key-uid))) (update :profile/login #(select-profile % key-uid)))
db) db)
:fx [[:set-root :profiles] :fx [[:set-root :screen/profile.profiles]
(when key-uid (when key-uid
[:effects.biometric/check-if-available [:effects.biometric/check-if-available
{:key-uid key-uid {:key-uid key-uid
:on-success (fn [auth-method] :on-success (fn [auth-method]
(rf/dispatch [:profile.login/check-biometric-success key-uid (rf/dispatch [:profile.login/check-biometric-success key-uid
auth-method]))}])]}) auth-method]))}])]})
{:fx [[:set-root :intro]]}))) {:fx [[:set-root :screen/onboarding.intro]]})))
(rf/reg-event-fx (rf/reg-event-fx
:profile/update-setting-from-backup :profile/update-setting-from-backup

2
src/status_im/contexts/profile/login/events.cljs
View File

@ -71,7 +71,7 @@
(cond (cond
pairing-completed? pairing-completed?
[[:set-root :syncing-results]] [[:set-root :screen/onboarding.syncing-results]]
(get db :onboarding/new-account?) (get db :onboarding/new-account?)
[[:dispatch [:onboarding/finalize-setup]]] [[:dispatch [:onboarding/finalize-setup]]]

4
src/status_im/contexts/profile/profiles/view.cljs
View File

@ -50,13 +50,13 @@
(when @push-animation-fn-atom (when @push-animation-fn-atom
(@push-animation-fn-atom)) (@push-animation-fn-atom))
(debounce/throttle-and-dispatch (debounce/throttle-and-dispatch
[:open-modal :new-to-status] [:open-modal :screen/onboarding.new-to-status]
1000)) 1000))
:accessibility-label :create-new-profile} :accessibility-label :create-new-profile}
{:icon :i/multi-profile {:icon :i/multi-profile
:label (i18n/label :t/add-existing-status-profile) :label (i18n/label :t/add-existing-status-profile)
:on-press #(debounce/throttle-and-dispatch :on-press #(debounce/throttle-and-dispatch
[:open-modal :sign-in] [:open-modal :screen/onboarding.sign-in]
1000) 1000)
:accessibility-label :multi-profile}]]]) :accessibility-label :multi-profile}]]])

3
src/status_im/contexts/profile/settings/view.cljs
View File

@ -53,7 +53,8 @@
{:background :blur {:background :blur
:icon-name :i/close :icon-name :i/close
:on-press #(rf/dispatch [:navigate-back]) :on-press #(rf/dispatch [:navigate-back])
:right-side [{:icon-name :i/multi-profile :on-press #(rf/dispatch [:open-modal :sign-in])} :right-side [{:icon-name :i/multi-profile
:on-press #(rf/dispatch [:open-modal :screen/onboarding.sign-in])}
{:icon-name :i/qr-code {:icon-name :i/qr-code
:on-press #(debounce/throttle-and-dispatch [:open-modal :share-shell] 1000)} :on-press #(debounce/throttle-and-dispatch [:open-modal :share-shell] 1000)}
{:icon-name :i/share :on-press not-implemented/alert}]}]] {:icon-name :i/share :on-press not-implemented/alert}]}]]

6
src/status_im/contexts/syncing/scan_sync_code/view.cljs
View File

@ -301,8 +301,8 @@
@camera-permission-granted? @camera-permission-granted?
@preflight-check-passed? @preflight-check-passed?
(some #{view-id} (some #{view-id}
[:sign-in-intro [:screen/onboarding.sign-in-intro
:sign-in :screen/onboarding.sign-in
:scan-sync-code-page]) :scan-sync-code-page])
(boolean (not-empty @qr-view-finder))) (boolean (not-empty @qr-view-finder)))
camera-ready-to-scan? (and (or (not animated?) @render-camera?) camera-ready-to-scan? (and (or (not animated?) @render-camera?)
@ -326,7 +326,7 @@
(when animated? (when animated?
(rn/use-effect (rn/use-effect
(fn [] (fn []
(when (= view-id :sign-in-intro) (when (= view-id :screen/onboarding.sign-in-intro)
(rn/hw-back-add-listener reset-animations-fn) (rn/hw-back-add-listener reset-animations-fn)
#(rn/hw-back-remove-listener reset-animations-fn))) #(rn/hw-back-remove-listener reset-animations-fn)))
[view-id]) [view-id])

38
src/status_im/navigation/roots.cljs
View File

@ -10,17 +10,17 @@
;; [:db :profile/profile :appearance] will be used (for mulitaccounts) ;; [:db :profile/profile :appearance] will be used (for mulitaccounts)
;; 3). Fallback theme - Dark ;; 3). Fallback theme - Dark
(def themes (def themes
{:intro constants/theme-type-dark {:screen/onboarding.intro constants/theme-type-dark
:profiles constants/theme-type-dark :screen/profile.profiles constants/theme-type-dark
:shell-stack nil}) :shell-stack nil})
(defn roots-internal (defn roots-internal
[] []
{:intro {:screen/onboarding.intro
{:root {:root
{:stack {:id :intro {:stack {:id :screen/onboarding.intro
:children [{:component {:name :intro :children [{:component {:name :screen/onboarding.intro
:id :intro :id :screen/onboarding.intro
:options (options/dark-root-options)}}]}}} :options (options/dark-root-options)}}]}}}
:shell-stack :shell-stack
{:root {:root
@ -29,25 +29,25 @@
:id :shell-stack :id :shell-stack
:options (options/root-options :options (options/root-options
{:nav-bar-color colors/neutral-100})}}]}}} {:nav-bar-color colors/neutral-100})}}]}}}
:profiles :screen/profile.profiles
{:root {:root
{:stack {:id :profiles {:stack {:id :screen/profile.profiles
:children [{:component {:name :profiles :children [{:component {:name :screen/profile.profiles
:id :profiles :id :screen/profile.profiles
:options (options/dark-root-options)}}]}}} :options (options/dark-root-options)}}]}}}
:enable-notifications :screen/onboarding.enable-notifications
{:root {:stack {:children [{:component {:name :enable-notifications {:root {:stack {:children [{:component {:name :screen/onboarding.enable-notifications
:id :enable-notifications :id :screen/onboarding.enable-notifications
:options (options/dark-root-options)}}]}}} :options (options/dark-root-options)}}]}}}
:welcome :screen/onboarding.welcome
{:root {:stack {:children [{:component {:name :welcome {:root {:stack {:children [{:component {:name :screen/onboarding.welcome
:id :welcome :id :screen/onboarding.welcome
:options (options/dark-root-options)}}]}}} :options (options/dark-root-options)}}]}}}
:syncing-results :screen/onboarding.syncing-results
{:root {:stack {:children [{:component {:name :syncing-results {:root {:stack {:children [{:component {:name :screen/onboarding.syncing-results
:id :syncing-results :id :screen/onboarding.syncing-results
:options (options/dark-root-options)}}]}}}}) :options (options/dark-root-options)}}]}}}})
(defn old-roots (defn old-roots

32
src/status_im/navigation/screens.cljs
View File

@ -192,12 +192,12 @@
:component settings-setup-syncing/view} :component settings-setup-syncing/view}
;; Onboarding ;; Onboarding
{:name :intro {:name :screen/onboarding.intro
:options {:theme :dark} :options {:theme :dark}
:on-focus [:onboarding/overlay-dismiss] :on-focus [:onboarding/overlay-dismiss]
:component intro/view} :component intro/view}
{:name :profiles {:name :screen/profile.profiles
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-layout} :layout options/onboarding-layout}
:on-focus [:onboarding/overlay-dismiss] :on-focus [:onboarding/overlay-dismiss]
@ -227,7 +227,7 @@
:options options/transparent-screen-options :options options/transparent-screen-options
:component share-contact/view} :component share-contact/view}
{:name :new-to-status {:name :screen/onboarding.new-to-status
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
:animations (merge :animations (merge
@ -237,14 +237,14 @@
:modalPresentationStyle :overCurrentContext} :modalPresentationStyle :overCurrentContext}
:component new-to-status/new-to-status} :component new-to-status/new-to-status}
{:name :create-profile {:name :screen/onboarding.create-profile
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
:animations transitions/push-animations-for-transparent-background :animations transitions/push-animations-for-transparent-background
:popGesture false} :popGesture false}
:component create-profile/create-profile} :component create-profile/create-profile}
{:name :create-profile-password {:name :screen/onboarding.create-profile-password
:options {:theme :dark :options {:theme :dark
:insets {:top false} :insets {:top false}
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
@ -252,7 +252,7 @@
:popGesture false} :popGesture false}
:component create-password/create-password} :component create-password/create-password}
{:name :enable-biometrics {:name :screen/onboarding.enable-biometrics
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
:animations (merge :animations (merge
@ -264,7 +264,7 @@
:popStackOnPress false}} :popStackOnPress false}}
:component enable-biometrics/view} :component enable-biometrics/view}
{:name :generating-keys {:name :screen/onboarding.generating-keys
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
:animations transitions/push-animations-for-transparent-background :animations transitions/push-animations-for-transparent-background
@ -273,14 +273,14 @@
:popStackOnPress false}} :popStackOnPress false}}
:component generating-keys/generating-keys} :component generating-keys/generating-keys}
{:name :enter-seed-phrase {:name :screen/onboarding.enter-seed-phrase
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
:animations transitions/push-animations-for-transparent-background :animations transitions/push-animations-for-transparent-background
:popGesture false} :popGesture false}
:component enter-seed-phrase/enter-seed-phrase} :component enter-seed-phrase/enter-seed-phrase}
{:name :enable-notifications {:name :screen/onboarding.enable-notifications
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
:animations (merge :animations (merge
@ -289,7 +289,7 @@
:modalPresentationStyle :overCurrentContext} :modalPresentationStyle :overCurrentContext}
:component enable-notifications/view} :component enable-notifications/view}
{:name :identifiers {:name :screen/onboarding.identifiers
:component identifiers/view :component identifiers/view
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
@ -302,7 +302,7 @@
:options options/dark-screen :options options/dark-screen
:component scan-sync-code-page/view} :component scan-sync-code-page/view}
{:name :sign-in-intro {:name :screen/onboarding.sign-in-intro
:options {:layout options/onboarding-transparent-layout :options {:layout options/onboarding-transparent-layout
:animations (merge :animations (merge
transitions/sign-in-modal-animations transitions/sign-in-modal-animations
@ -310,30 +310,30 @@
:modalPresentationStyle :overCurrentContext} :modalPresentationStyle :overCurrentContext}
:component sign-in/animated-view} :component sign-in/animated-view}
{:name :sign-in {:name :screen/onboarding.sign-in
:options {:theme :dark :options {:theme :dark
:modalPresentationStyle :overCurrentContext :modalPresentationStyle :overCurrentContext
:layout options/onboarding-layout} :layout options/onboarding-layout}
:component sign-in/view} :component sign-in/view}
{:name :syncing-progress {:name :screen/onboarding.syncing-progress
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-layout :layout options/onboarding-layout
:popGesture false} :popGesture false}
:component syncing-devices/view} :component syncing-devices/view}
{:name :syncing-progress-intro {:name :screen/onboarding.syncing-progress-intro
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
:animations transitions/push-animations-for-transparent-background :animations transitions/push-animations-for-transparent-background
:popGesture false} :popGesture false}
:component syncing-devices/view-onboarding} :component syncing-devices/view-onboarding}
{:name :syncing-results {:name :screen/onboarding.syncing-results
:options {:theme :dark} :options {:theme :dark}
:component syncing-results/view} :component syncing-results/view}
{:name :welcome {:name :screen/onboarding.welcome
:options {:theme :dark :options {:theme :dark
:layout options/onboarding-transparent-layout :layout options/onboarding-transparent-layout
:animations transitions/push-animations-for-transparent-background} :animations transitions/push-animations-for-transparent-background}

2
src/status_im/subs/general.cljs
View File

@ -185,7 +185,7 @@
:my-profile/recovery :my-profile/recovery
:<- [:my-profile/seed] :<- [:my-profile/seed]
(fn [seed] (fn [seed]
(or seed {:step :intro}))) (or seed {:step :screen/onboarding.intro})))
(re-frame/reg-sub (re-frame/reg-sub
:bottom-sheet-old :bottom-sheet-old

2
src/test_helpers/integration.cljs
View File

@ -179,7 +179,7 @@
(p/let [masked-seed-phrase (security/mask-data (:seed-phrase constants/recovery-account)) (p/let [masked-seed-phrase (security/mask-data (:seed-phrase constants/recovery-account))
[mnemonic key-uid] (validate-mnemonic masked-seed-phrase)] [mnemonic key-uid] (validate-mnemonic masked-seed-phrase)]
(rf/dispatch [:onboarding/seed-phrase-validated (security/mask-data mnemonic) key-uid]) (rf/dispatch [:onboarding/seed-phrase-validated (security/mask-data mnemonic) key-uid])
(rf/dispatch [:pop-to-root :profiles]) (rf/dispatch [:pop-to-root :screen/profile.profiles])
(rf/dispatch [:profile/profile-selected key-uid]) (rf/dispatch [:profile/profile-selected key-uid])
(recover-and-login mnemonic))) (recover-and-login mnemonic)))