Skip to content

Commit

Permalink
fix issue 1
Browse files Browse the repository at this point in the history
  • Loading branch information
Parveshdhull committed Sep 11, 2024
1 parent a8fbe7e commit ed58ebd
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 20 deletions.
4 changes: 0 additions & 4 deletions src/status_im/contexts/onboarding/syncing/progress/style.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,3 @@
:align-items :center
:align-self :center
:justify-content :center})

(def try-again-button
{:margin-top 20
:padding-horizontal 20})
35 changes: 21 additions & 14 deletions src/status_im/contexts/onboarding/syncing/progress/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,32 @@
[:onboarding/navigate-to-sign-in-by-seed-phrase :screen/onboarding.sync-or-recover-profile]
500))

(defn- try-again
[]
(rf/dispatch [:syncing/clear-states])
(rf/dispatch [:navigate-back]))

(defn try-again-button
[profile-color logged-in?]
[:<>
(when-not logged-in?
[quo/button
{:on-press navigate-to-enter-seed-phrase
:accessibility-label :try-seed-phrase-button
:customization-color profile-color
:container-style style/try-again-button}
(i18n/label :t/enter-seed-phrase)])
[quo/button
{:on-press (fn []
(rf/dispatch [:syncing/clear-states])
(rf/dispatch [:navigate-back]))
[quo/bottom-actions
{:actions (if logged-in? :one-action :two-actions)
:blur? true
:button-one-label (i18n/label :t/recovery-phrase)
:button-one-props {:type :primary
:accessibility-label :try-seed-phrase-button
:customization-color profile-color
:container-style {:flex 1}
:size 40
:on-press navigate-to-enter-seed-phrase}
(if logged-in? :button-one-label :button-two-label)
(i18n/label :t/try-again)
(if logged-in? :button-one-props :button-two-props)
{:type (if logged-in? :primary :grey)
:accessibility-label :try-again-later-button
:customization-color profile-color
:container-style {:flex 1}
:size 40
:container-style style/try-again-button}
(i18n/label :t/try-again)]])
:on-press try-again}}])

(defn- illustration
[pairing-progress?]
Expand Down
3 changes: 1 addition & 2 deletions translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,6 @@
"enter-puk-code-description": "6-digit passcode has been blocked.\n Please enter PUK code to unblock passcode.",
"enter-recipient-address-or-username": "Enter address or username of the recipient",
"enter-recovery-phrase": "Enter recovery phrase",
"enter-seed-phrase": "Enter seed phrase",
"enter-sync-code": "Enter sync code",
"enter-url": "Enter URL",
"enter-user-pk": "Enter user public key",
Expand Down Expand Up @@ -2005,7 +2004,7 @@
"recover-with-seed-phrase": "Recover with seed phrase",
"recovering-key": "Accessing keys...",
"recovery-confirm-phrase": "Confirm seed phrase",
"recovery-phrase": "Seed phrase",
"recovery-phrase": "Recovery phrase",
"recovery-success-text": "You will have to create a new code or password to re-encrypt your keys",
"recovery-typo-dialog-description": "Please note, your seed phrase must use the exact same words and order as you received it",
"recovery-typo-dialog-title": "Is the seed phrase correct?",
Expand Down

0 comments on commit ed58ebd

Please sign in to comment.