[#10860] Rename and move Access keys in onboarding

status-im · Jul 2, 2020 · 9619a0a · 9619a0a
1 parent dfb8420
commit 9619a0a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/status_im/ui/screens/intro/views.cljs b/src/status_im/ui/screens/intro/views.cljs
@@ -37,13 +37,9 @@
                         :title :intro-title3
                         :text :intro-text3}] window-height view-id]
      [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])
                                  :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
        {:style styles/welcome-text-bottom-note}
        (i18n/label :t/intro-privacy-policy-note1)
@@ -247,7 +243,13 @@
                                                             (and (= step :create-code) weak-password?)
                                                             (and (= step :enter-phrase) next-button-disabled?))
                                              :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)))
      [react/text {:style (assoc styles/wizard-text :margin-top 20)}
       (i18n/label (cond (= :recovery-success step)

diff --git a/src/status_im/ui/screens/multiaccounts/login/views.cljs b/src/status_im/ui/screens/multiaccounts/login/views.cljs
@@ -94,7 +94,7 @@
         [react/i18n-text {:style styles/processing :key :processing}]])
      [react/view {:style (styles/bottom-button-container)}
       [components.common/button
-       {:label        (i18n/label :t/access-key)
+       {:label        (i18n/label :t/access-existing-keys)
         :button-style styles/bottom-button
         :background?  false
         :on-press     #(do

diff --git a/src/status_im/ui/screens/multiaccounts/views.cljs b/src/status_im/ui/screens/multiaccounts/views.cljs
@@ -62,4 +62,4 @@
       [react/view {:style (styles/bottom-button-container)}
        [button/button {:on-press #(re-frame/dispatch [:multiaccounts.recover.ui/recover-multiaccount-button-pressed])
                        :type     :secondary
-                       :label    (i18n/label :t/access-key)}]]]]))
+                       :label    (i18n/label :t/access-existing-keys)}]]]]))
diff --git a/translations/en.json b/translations/en.json
@@ -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-title": "Names can’t be changed",
     "access-key": "Access key",
+    "access-existing-keys": "Access existing keys",
     "accept-and-share-address": "Accept and share address",
     "account-added": "Account added",
     "account-color": "Account color",