status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-03-01 11:00:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix UI issues in backup seed phrase

Browse Source 
Fixes #10964
This commit is contained in:
Gheorghe Pinzaru 2020-07-16 14:54:22 +03:00
parent 0f07f3eecb
commit 4f135292a5
No known key found for this signature in database
GPG Key ID: C9A094959935A952
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/quo/components/text_input.cljs
View File

@ -230,9 +230,7 @@
:on-press on-cancel} :on-press on-cancel}
[text/text {:color :link} cancel-label]]) [text/text {:color :link} cancel-label]])
(when error (when error
[tooltip/tooltip (merge {:bottom-value (cond bottom-value bottom-value [tooltip/tooltip (merge {:bottom-value (if bottom-value bottom-value 0)}
label 30 ; 22 line height 8 margin
)}
(when accessibility-label (when accessibility-label
{:accessibility-label (str (name accessibility-label) "-error")})) {:accessibility-label (str (name accessibility-label) "-error")}))
[text/text {:color :negative [text/text {:color :negative

5
src/status_im/ui/screens/profile/seed/styles.cljs
View File

@ -69,8 +69,9 @@
:padding 16}) :padding 16})
(def enter-word-n-description (def enter-word-n-description
{:font-size 14 {:font-size 14
:color colors/gray}) :color colors/gray
:margin-vertical 16})
(def finish-container (def finish-container
{:flex 1 {:flex 1

25
src/status_im/ui/screens/profile/seed/views.cljs
View File

@ -38,10 +38,10 @@
:key :your-data-belongs-to-you}] :key :your-data-belongs-to-you}]
[react/i18n-text {:style styles/intro-description [react/i18n-text {:style styles/intro-description
:key :your-data-belongs-to-you-description}] :key :your-data-belongs-to-you-description}]
[quo/button [react/view {:style styles/intro-button}
{:style styles/intro-button [quo/button
:on-press #(re-frame/dispatch [:set-in [:my-profile/seed :step] :12-words])} {:on-press #(re-frame/dispatch [:set-in [:my-profile/seed :step] :12-words])}
(i18n/label :t/ok-continue)]]) (i18n/label :t/ok-continue)]]])
(defn six-words [words] (defn six-words [words]
[react/view {:style styles/six-words-container} [react/view {:style styles/six-words-container}
@ -94,8 +94,8 @@
(defn enter-word [step [idx word] error entered-word] (defn enter-word [step [idx word] error entered-word]
^{:key word} ^{:key word}
[react/view {:flex 1} [:<>
[react/view {:style styles/enter-word-container} [react/scroll-view {:style styles/enter-word-container}
[quo/text-input [quo/text-input
{:placeholder (i18n/label :t/enter-word) {:placeholder (i18n/label :t/enter-word)
:label [:<> :label [:<>
@ -106,6 +106,7 @@
:auto-focus true :auto-focus true
:auto-correct false :auto-correct false
:keyboard-type "visible-password" :keyboard-type "visible-password"
:monospace true
:on-change-text #(re-frame/dispatch [:set-in [:my-profile/seed :word] %]) :on-change-text #(re-frame/dispatch [:set-in [:my-profile/seed :word] %])
:on-submit-editing next-handler :on-submit-editing next-handler
:error error}] :error error}]
@ -114,9 +115,9 @@
[react/view styles/twelve-words-spacer]] [react/view styles/twelve-words-spacer]]
[toolbar/toolbar [toolbar/toolbar
{:right {:right
[quo/button (merge {:type :secondary [quo/button (merge {:type :secondary
:disabled (string/blank? entered-word) :disabled (string/blank? entered-word)
:on-press (next-handler word entered-word step)} :on-press (next-handler word entered-word step)}
(when-not (= :second-word step) (when-not (= :second-word step)
{:after :main-icon/next})) {:after :main-icon/next}))
(if (= :second-word step) (if (= :second-word step)
@ -132,9 +133,9 @@
(i18n/label :t/you-are-all-set)] (i18n/label :t/you-are-all-set)]
[react/text {:style styles/finish-description} [react/text {:style styles/finish-description}
(i18n/label :t/you-are-all-set-description)] (i18n/label :t/you-are-all-set-description)]
[quo/button {:style styles/finish-button [react/view {:style styles/finish-button}
:on-press #(re-frame/dispatch [:navigate-back])} [quo/button {:on-press #(re-frame/dispatch [:navigate-back])}
(i18n/label :t/ok-got-it)]]) (i18n/label :t/ok-got-it)]]])
(defview backup-seed [] (defview backup-seed []
(letsubs [current-multiaccount [:multiaccount] (letsubs [current-multiaccount [:multiaccount]