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

No option to recover immediately after a fresh install. #741

This commit is contained in:
Andrey Shovkoplyas 2017-10-19 15:57:52 +03:00 committed by Roman Volosovskyi
parent dba52f9de7
commit 01b1f2da4b
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/status_im/chat/screen.cljs
View File

@ -113,11 +113,13 @@
creating? [:get :accounts/creating-account?]]
[view
[status-bar]
(let [hide-nav? (or (empty? accounts) show-actions? creating?)]
[toolbar/toolbar2 {:show-sync-bar? true}
(when-not hide-nav? toolbar/default-nav-back)
[toolbar-content-view]
[toolbar-action]])
[toolbar/toolbar2 {:show-sync-bar? true}
(when-not (or show-actions? creating?)
(if (empty? accounts)
[toolbar/nav-clear-text (label :t/recover) #(dispatch [:navigate-to-modal :recover-modal])]
toolbar/default-nav-back))
[toolbar-content-view]
[toolbar-action]]
[add-contact-bar]])
(defn get-intro-status-message [all-messages]

3
src/status_im/chat/styles/screen.cljs
View File

@ -51,8 +51,7 @@
:android {:align-items :flex-start
:margin-left (if show-actions 66 18)
:padding-bottom 6}
:ios {:align-items :center
:margin-left (if show-actions 54 6)}})
:ios {:align-items :center}})
(def chat-name-text
{:color color-gray6

2
src/status_im/ui/screens/accounts/recover/events.cljs
View File

@ -45,7 +45,7 @@
(when-not (str/blank? public-key)
{:db (update db :accounts/recover assoc :passphrase "" :password "")
:dispatch-n [[:add-account account]
[:navigate-back]]}))))
[:navigate-to-clean :accounts]]}))))
(register-handler-fx
:recover-account

13
src/status_im/ui/screens/accounts/recover/views.cljs
View File

@ -40,16 +40,23 @@
:secure-text-entry true
:error error}]]))
(defview recover []
(defview recover [& [modal?]]
(letsubs [{:keys [passphrase password]} [:get :accounts/recover]]
(let [valid-form? (and
(spec/valid? ::v/passphrase passphrase)
(spec/valid? ::v/password password))]
[keyboard-avoiding-view {:style st/screen-container}
[status-bar]
[toolbar {:title (i18n/label :t/recover-access)}]
[toolbar {:title (i18n/label :t/recover-access) :modal? modal?}]
[passphrase-input (or passphrase "")]
[password-input (or password "")]
[view {:flex 1}]
(when valid-form?
[sticky-button (i18n/label :t/recover-access) #(dispatch [:recover-account passphrase password])])])))
[sticky-button
(i18n/label :t/recover-access)
#(do
(when modal? (dispatch [:navigate-back]))
(dispatch [:recover-account passphrase password]))])])))
(defview recover-modal []
[recover true])

3
src/status_im/ui/screens/views.cljs
View File

@ -8,7 +8,7 @@
[status-im.components.context-menu :refer [menu-context]]
[status-im.ui.screens.accounts.login.views :refer [login]]
[status-im.ui.screens.accounts.recover.views :refer [recover]]
[status-im.ui.screens.accounts.recover.views :refer [recover recover-modal]]
[status-im.ui.screens.accounts.views :refer [accounts]]
[status-im.chat.screen :refer [chat]]
@ -120,6 +120,7 @@
(let [component (case modal-view
:qr-scanner qr-scanner
:qr-code-view qr-code-view
:recover-modal recover-modal
:contact-list-modal contact-list-modal
:wallet-transactions-filter wallet-transactions/filter-history
:wallet-send-transaction-modal send-transaction-modal

2
src/status_im/ui/screens/wallet/wallet_list/views.cljs
View File

@ -1,5 +1,5 @@
(ns status-im.ui.screens.wallet.wallet-list.views
(:require-macros [status-im.utils.views :refer [defview]])
(:require-macros [status-im.utils.views :refer [defview letsubs]])
(:require [clojure.string :as string]
[re-frame.core :as re-frame]
[status-im.components.list.views :as list]