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

Merge branch 'develop' into 21571-ask-user-to-update-their-profile

This commit is contained in:
Ulises Manuel 2024-12-20 17:50:42 -06:00 committed by GitHub
parent ca4b9dc748 a85ca5bd3d
commit 020e622091
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/status_im/contexts/keycard/migrate/fail/view.cljs
View File

@ -13,7 +13,7 @@
customization-color (rf/sub [:profile/customization-color])] customization-color (rf/sub [:profile/customization-color])]
[:<> [:<>
[quo/page-top [quo/page-top
{:title (i18n/label :t/failed-to-migrate-key-pair) {:title (i18n/label :t/something-didnt-go-as-planned)
:description :context-tag :description :context-tag
:context-tag {:full-name profile-name :context-tag {:full-name profile-name
:profile-picture profile-picture :profile-picture profile-picture
@ -24,9 +24,9 @@
{:resize-mode :contain {:resize-mode :contain
:source (resources/get-image :keycard-migration-failed)}]] :source (resources/get-image :keycard-migration-failed)}]]
[quo/divider-label (i18n/label :t/what-you-can-do)] [quo/divider-label (i18n/label :t/what-you-can-do)]
[quo/markdown-list {:description (i18n/label :t/log-out-remove-profile)}] [quo/markdown-list {:description (i18n/label :t/keycard-migration-failed-instruction-1)}]
[quo/markdown-list {:description (i18n/label :t/recover-status-profile)}] [quo/markdown-list {:description (i18n/label :t/keycard-migration-failed-instruction-2)}]
[quo/bottom-actions [quo/bottom-actions
{:actions :one-action {:actions :one-action
:button-one-label (i18n/label :t/log-out-remove) :button-one-label (i18n/label :t/logout)
:button-one-props {:on-press #(rf/dispatch [:profile/logout])}}]])) :button-one-props {:on-press #(rf/dispatch [:profile/logout])}}]]))

3
translations/en.json
View File

@ -1387,6 +1387,8 @@
"keycard-is-frozen-reset": "Reset with PUK", "keycard-is-frozen-reset": "Reset with PUK",
"keycard-is-frozen-title": "Keycard is frozen", "keycard-is-frozen-title": "Keycard is frozen",
"keycard-locked": "Keycard is locked", "keycard-locked": "Keycard is locked",
"keycard-migration-failed-instruction-1": "Try logging out and logging back in with Keycard; everything might work fine.",
"keycard-migration-failed-instruction-2": "If the key pair hasn’t migrated to Keycard, remove your profile, and recover it using your recovery phrase.",
"keycard-not-empty": "Keycard is not empty", "keycard-not-empty": "Keycard is not empty",
"keycard-onboarding-finishing-header": "Finishing up", "keycard-onboarding-finishing-header": "Finishing up",
"keycard-onboarding-intro-header": "Store your keys on Keycard", "keycard-onboarding-intro-header": "Store your keys on Keycard",
@ -2428,6 +2430,7 @@
"slippage-should-be-more-than-0": "Slippage should be more than 0", "slippage-should-be-more-than-0": "Slippage should be more than 0",
"slow": "Slow", "slow": "Slow",
"something-about-you": "Something about you", "something-about-you": "Something about you",
"something-didnt-go-as-planned": "Something didn't go as planned",
"something-went-wrong": "Something went wrong", "something-went-wrong": "Something went wrong",
"something-went-wrong-please-try-again-later": "Something went wrong. Modify swap parameters or try again later.", "something-went-wrong-please-try-again-later": "Something went wrong. Modify swap parameters or try again later.",
"soon": "Soon", "soon": "Soon",