Fix recovery with seed after visiting keycard recovery

This commit is contained in:
Roman Volosovskyi 2019-12-04 09:40:10 +02:00
parent 4d3c622947
commit 15d9e7be86
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
1 changed files with 17 additions and 13 deletions

View File

@ -14,7 +14,8 @@
[status-im.utils.security :as security] [status-im.utils.security :as security]
[status-im.utils.types :as types] [status-im.utils.types :as types]
[status-im.utils.platform :as platform] [status-im.utils.platform :as platform]
[status-im.utils.utils :as utils])) [status-im.utils.utils :as utils]
[status-im.ui.components.bottom-sheet.core :as bottom-sheet]))
(defn existing-account? (defn existing-account?
[root-key multiaccounts] [root-key multiaccounts]
@ -139,9 +140,11 @@
(fx/defn enter-phrase-pressed (fx/defn enter-phrase-pressed
{:events [::enter-phrase-pressed]} {:events [::enter-phrase-pressed]}
[{:keys [db] :as cofx}] [{:keys [db] :as cofx}]
(fx/merge cofx (fx/merge
{:db (assoc db cofx
:intro-wizard {:step :enter-phrase {:db (-> db
(assoc :intro-wizard
{:step :enter-phrase
:recovering? true :recovering? true
:next-button-disabled? true :next-button-disabled? true
:weak-password? true :weak-password? true
@ -149,7 +152,8 @@
:first-time-setup? false :first-time-setup? false
:back-action :intro-wizard/navigate-back :back-action :intro-wizard/navigate-back
:forward-action :multiaccounts.recover/enter-phrase-next-pressed}) :forward-action :multiaccounts.recover/enter-phrase-next-pressed})
:dispatch [:bottom-sheet/hide-sheet]} (update :hardwallet dissoc :flow))}
(bottom-sheet/hide-bottom-sheet)
(navigation/navigate-to-cofx :recover-multiaccount-enter-phrase nil))) (navigation/navigate-to-cofx :recover-multiaccount-enter-phrase nil)))
(fx/defn proceed-to-import-mnemonic (fx/defn proceed-to-import-mnemonic