Skip to content

Commit ed58ebd

Browse files
committed
fix issue 1
1 parent a8fbe7e commit ed58ebd

File tree

3 files changed

+22
-20
lines changed

3 files changed

+22
-20
lines changed

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

-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,3 @@
2727
:align-items :center
2828
:align-self :center
2929
:justify-content :center})
30-
31-
(def try-again-button
32-
{:margin-top 20
33-
:padding-horizontal 20})

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

+21-14
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,32 @@
3333
[:onboarding/navigate-to-sign-in-by-seed-phrase :screen/onboarding.sync-or-recover-profile]
3434
500))
3535

36+
(defn- try-again
37+
[]
38+
(rf/dispatch [:syncing/clear-states])
39+
(rf/dispatch [:navigate-back]))
40+
3641
(defn try-again-button
3742
[profile-color logged-in?]
38-
[:<>
39-
(when-not logged-in?
40-
[quo/button
41-
{:on-press navigate-to-enter-seed-phrase
42-
:accessibility-label :try-seed-phrase-button
43-
:customization-color profile-color
44-
:container-style style/try-again-button}
45-
(i18n/label :t/enter-seed-phrase)])
46-
[quo/button
47-
{:on-press (fn []
48-
(rf/dispatch [:syncing/clear-states])
49-
(rf/dispatch [:navigate-back]))
43+
[quo/bottom-actions
44+
{:actions (if logged-in? :one-action :two-actions)
45+
:blur? true
46+
:button-one-label (i18n/label :t/recovery-phrase)
47+
:button-one-props {:type :primary
48+
:accessibility-label :try-seed-phrase-button
49+
:customization-color profile-color
50+
:container-style {:flex 1}
51+
:size 40
52+
:on-press navigate-to-enter-seed-phrase}
53+
(if logged-in? :button-one-label :button-two-label)
54+
(i18n/label :t/try-again)
55+
(if logged-in? :button-one-props :button-two-props)
56+
{:type (if logged-in? :primary :grey)
5057
:accessibility-label :try-again-later-button
5158
:customization-color profile-color
59+
:container-style {:flex 1}
5260
:size 40
53-
:container-style style/try-again-button}
54-
(i18n/label :t/try-again)]])
61+
:on-press try-again}}])
5562

5663
(defn- illustration
5764
[pairing-progress?]

translations/en.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,6 @@
961961
"enter-puk-code-description": "6-digit passcode has been blocked.\n Please enter PUK code to unblock passcode.",
962962
"enter-recipient-address-or-username": "Enter address or username of the recipient",
963963
"enter-recovery-phrase": "Enter recovery phrase",
964-
"enter-seed-phrase": "Enter seed phrase",
965964
"enter-sync-code": "Enter sync code",
966965
"enter-url": "Enter URL",
967966
"enter-user-pk": "Enter user public key",
@@ -2005,7 +2004,7 @@
20052004
"recover-with-seed-phrase": "Recover with seed phrase",
20062005
"recovering-key": "Accessing keys...",
20072006
"recovery-confirm-phrase": "Confirm seed phrase",
2008-
"recovery-phrase": "Seed phrase",
2007+
"recovery-phrase": "Recovery phrase",
20092008
"recovery-success-text": "You will have to create a new code or password to re-encrypt your keys",
20102009
"recovery-typo-dialog-description": "Please note, your seed phrase must use the exact same words and order as you received it",
20112010
"recovery-typo-dialog-title": "Is the seed phrase correct?",

0 commit comments

Comments
 (0)