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

[#10860] Rename and move Access keys in onboarding

This commit is contained in:
andrey 2020-06-30 16:28:40 +02:00
parent dfb8420353
commit 9619a0a204
No known key found for this signature in database
GPG Key ID: 89B67245FD2F0272
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/status_im/ui/screens/intro/views.cljs
View File

@ -37,13 +37,9 @@
:title :intro-title3 :title :intro-title3
:text :intro-text3}] window-height view-id] :text :intro-text3}] window-height view-id]
[react/view styles/buttons-container [react/view styles/buttons-container
[components.common/button {:button-style (assoc styles/bottom-button :margin-bottom 16) [components.common/button {:button-style (assoc styles/bottom-button :margin-bottom 24)
:on-press #(re-frame/dispatch [:multiaccounts.create.ui/intro-wizard]) :on-press #(re-frame/dispatch [:multiaccounts.create.ui/intro-wizard])
:label (i18n/label :t/get-started)}] :label (i18n/label :t/get-started)}]
[components.common/button {:button-style (assoc styles/bottom-button :margin-bottom 24)
:on-press #(re-frame/dispatch [:multiaccounts.recover.ui/recover-multiaccount-button-pressed])
:label (i18n/label :t/access-key)
:background? false}]
[react/nested-text [react/nested-text
{:style styles/welcome-text-bottom-note} {:style styles/welcome-text-bottom-note}
(i18n/label :t/intro-privacy-policy-note1) (i18n/label :t/intro-privacy-policy-note1)
@ -247,7 +243,13 @@
(and (= step :create-code) weak-password?) (and (= step :create-code) weak-password?)
(and (= step :enter-phrase) next-button-disabled?)) (and (= step :enter-phrase) next-button-disabled?))
:forward? true}]]]) :forward? true}]]])
(when (and (= :generate-key step) (not processing?))
[components.common/button
{:button-style (assoc styles/bottom-button :margin-top 8)
:on-press #(re-frame/dispatch
[:multiaccounts.recover.ui/recover-multiaccount-button-pressed])
:label (i18n/label :t/access-existing-keys)
:background? false}])
(when (or (= :generate-key step) (and processing? (= :recovery-success step))) (when (or (= :generate-key step) (and processing? (= :recovery-success step)))
[react/text {:style (assoc styles/wizard-text :margin-top 20)} [react/text {:style (assoc styles/wizard-text :margin-top 20)}
(i18n/label (cond (= :recovery-success step) (i18n/label (cond (= :recovery-success step)

2
src/status_im/ui/screens/multiaccounts/login/views.cljs
View File

@ -94,7 +94,7 @@
[react/i18n-text {:style styles/processing :key :processing}]]) [react/i18n-text {:style styles/processing :key :processing}]])
[react/view {:style (styles/bottom-button-container)} [react/view {:style (styles/bottom-button-container)}
[components.common/button [components.common/button
{:label (i18n/label :t/access-key) {:label (i18n/label :t/access-existing-keys)
:button-style styles/bottom-button :button-style styles/bottom-button
:background? false :background? false
:on-press #(do :on-press #(do

2
src/status_im/ui/screens/multiaccounts/views.cljs
View File

@ -62,4 +62,4 @@
[react/view {:style (styles/bottom-button-container)} [react/view {:style (styles/bottom-button-container)}
[button/button {:on-press #(re-frame/dispatch [:multiaccounts.recover.ui/recover-multiaccount-button-pressed]) [button/button {:on-press #(re-frame/dispatch [:multiaccounts.recover.ui/recover-multiaccount-button-pressed])
:type :secondary :type :secondary
:label (i18n/label :t/access-key)}]]]])) :label (i18n/label :t/access-existing-keys)}]]]]))

1
translations/en.json
View File

@ -5,6 +5,7 @@
"about-names-content": "No one can pretend to be you! You’re anonymous by default and never have to reveal your real name. You can register a custom name for a small fee.", "about-names-content": "No one can pretend to be you! You’re anonymous by default and never have to reveal your real name. You can register a custom name for a small fee.",
"about-names-title": "Names can’t be changed", "about-names-title": "Names can’t be changed",
"access-key": "Access key", "access-key": "Access key",
"access-existing-keys": "Access existing keys",
"accept-and-share-address": "Accept and share address", "accept-and-share-address": "Accept and share address",
"account-added": "Account added", "account-added": "Account added",
"account-color": "Account color", "account-color": "Account color",