Skip to content

Commit 69cb8d9

Browse files
committed
add preparing status screen
1 parent 28d29ed commit 69cb8d9

File tree

9 files changed

+67
-3
lines changed

9 files changed

+67
-3
lines changed
723 KB
Loading
1.27 MB
Loading

src/status_im/common/resources.cljs

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
:notifications (js/require "../resources/images/ui2/notifications.png")
2929
:nfc-prompt (js/require "../resources/images/ui2/nfc-prompt.png")
3030
:nfc-success (js/require "../resources/images/ui2/nfc-success.png")
31+
:preparing-status (js/require "../resources/images/ui2/preparing-status.png")
3132
:syncing-devices (js/require "../resources/images/ui2/syncing_devices.png")
3233
:syncing-wrong (js/require "../resources/images/ui2/syncing_wrong.png")})
3334

src/status_im/contexts/centralized_metrics/tracking.cljs

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
:screen/onboarding.enable-biometrics
3838
:screen/onboarding.generating-keys
3939
:screen/onboarding.enable-notifications
40+
:screen/onboarding.preparing-status
4041
:screen/onboarding.sign-in-intro
4142
:screen/onboarding.sign-in
4243
:screen/onboarding.syncing-progress

src/status_im/contexts/onboarding/events.cljs

+6-3
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,20 @@
7171
{:events [:onboarding/create-account-and-login]}
7272
[{:keys [db] :as cofx}]
7373
(let [{:keys [display-name seed-phrase password image-path color] :as profile}
74-
(:onboarding/profile db)]
74+
(:onboarding/profile db)
75+
loading-screen (if (seq (:syncing/key-uid db))
76+
:screen/onboarding.preparing-status
77+
:screen/onboarding.generating-keys)]
7578
(rf/merge cofx
7679
{:dispatch [:navigate-to-within-stack
77-
[:screen/onboarding.generating-keys
80+
[loading-screen
7881
(get db
7982
:onboarding/navigated-to-enter-seed-phrase-from-screen
8083
:screen/onboarding.new-to-status)]]
8184
:dispatch-later [{:ms constants/onboarding-generating-keys-animation-duration-ms
8285
:dispatch [:navigate-to-within-stack
8386
[:screen/onboarding.enable-notifications
84-
:screen/onboarding.generating-keys]]}]
87+
loading-screen]]}]
8588
:db (-> db
8689
(dissoc :profile/login)
8790
(dissoc :auth-method)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
(ns status-im.contexts.onboarding.preparing-status.style)
2+
3+
(defn page-container
4+
[insets]
5+
{:flex 1
6+
:padding-top (:top insets)})
7+
8+
(defn page-illustration
9+
[width]
10+
{:flex 1
11+
:width width})
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
(ns status-im.contexts.onboarding.preparing-status.view
2+
(:require
3+
[quo.core :as quo]
4+
[react-native.core :as rn]
5+
[react-native.safe-area :as safe-area]
6+
[status-im.common.resources :as resources]
7+
[status-im.contexts.onboarding.generating-keys.style :as style]
8+
[utils.i18n :as i18n]))
9+
10+
(defn title
11+
[]
12+
[rn/view
13+
{:style {:margin-top 56
14+
:height 56
15+
:margin-bottom 10}}
16+
[quo/text-combinations
17+
{:container-style {:margin-horizontal 20
18+
:margin-vertical 12}
19+
:title (i18n/label :t/preparing-status-for-you)
20+
:description (i18n/label :t/hang-in-there)}]])
21+
22+
(defn content
23+
[]
24+
(let [width (:width (rn/get-window))]
25+
[rn/image
26+
{:resize-mode :stretch
27+
:style (style/page-illustration width)
28+
:source (resources/get-image :preparing-status)}]))
29+
30+
(defn view
31+
[]
32+
(let [insets (safe-area/get-insets)]
33+
[rn/view {:style (style/page-container insets)}
34+
[:<>
35+
[title]
36+
[content]]]))

src/status_im/navigation/screens.cljs

+10
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
[status-im.contexts.onboarding.generating-keys.view :as generating-keys]
3535
[status-im.contexts.onboarding.identifiers.view :as identifiers]
3636
[status-im.contexts.onboarding.intro.view :as intro]
37+
[status-im.contexts.onboarding.preparing-status.view :as preparing-status]
3738
[status-im.contexts.onboarding.sign-in.view :as sign-in]
3839
[status-im.contexts.onboarding.syncing.progress.view :as syncing-devices]
3940
[status-im.contexts.onboarding.syncing.results.view :as syncing-results]
@@ -344,6 +345,15 @@
344345
:popStackOnPress false}}
345346
:component generating-keys/view}
346347

348+
{:name :screen/onboarding.preparing-status
349+
:options {:theme :dark
350+
:layout options/onboarding-transparent-layout
351+
:animations transitions/push-animations-for-transparent-background
352+
:popGesture false
353+
:hardwareBackButton {:dismissModalOnPress false
354+
:popStackOnPress false}}
355+
:component preparing-status/view}
356+
347357
{:name :screen/onboarding.enter-seed-phrase
348358
:options {:theme :dark
349359
:layout options/onboarding-transparent-layout

translations/en.json

+2
Original file line numberDiff line numberDiff line change
@@ -1107,6 +1107,7 @@
11071107
"group-membership-request": "Group membership request",
11081108
"groups": "Groups",
11091109
"gwei": "Gwei",
1110+
"hang-in-there": "Hang in there! Just a few more seconds!",
11101111
"has-permissions": "has permission to access",
11111112
"hash": "Hash",
11121113
"have-a-sync-code?": "Have a sync code?",
@@ -1918,6 +1919,7 @@
19181919
"powered-by-paraswap": "Powered by Paraswap",
19191920
"preference": "Preference",
19201921
"preferred-by-receiver": "Preferred by receiver",
1922+
"preparing-status-for-you": "Preparing Status for you...",
19211923
"press": "Press",
19221924
"preview-privacy": "Preview privacy mode",
19231925
"previewing-may-share-metadata": "Previewing links from these websites may share your metadata with their owners",

0 commit comments

Comments
 (0)