Disallow recovering of an existing multiaccount
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
parent
481092dd25
commit
b2a70c8331
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
(defn existing-account?
|
(defn existing-account?
|
||||||
[root-key multiaccounts]
|
[root-key multiaccounts]
|
||||||
(contains? multiaccounts (:key-uid root-key)))
|
(contains? multiaccounts (:keyUid root-key)))
|
||||||
|
|
||||||
(re-frame/reg-fx
|
(re-frame/reg-fx
|
||||||
::validate-mnemonic
|
::validate-mnemonic
|
||||||
|
@ -130,7 +130,7 @@
|
||||||
|
|
||||||
(fx/defn on-import-multiaccount-success
|
(fx/defn on-import-multiaccount-success
|
||||||
{:events [::import-multiaccount-success]}
|
{:events [::import-multiaccount-success]}
|
||||||
[{:keys [db] :as cofx} {:keys [key-uid] :as root-data} derived-data]
|
[{:keys [db] :as cofx} root-data derived-data]
|
||||||
(let [multiaccounts (:multiaccounts/multiaccounts db)]
|
(let [multiaccounts (:multiaccounts/multiaccounts db)]
|
||||||
(fx/merge
|
(fx/merge
|
||||||
cofx
|
cofx
|
||||||
|
@ -140,7 +140,7 @@
|
||||||
:step :recovery-success
|
:step :recovery-success
|
||||||
:forward-action :multiaccounts.recover/re-encrypt-pressed)}
|
:forward-action :multiaccounts.recover/re-encrypt-pressed)}
|
||||||
(when (existing-account? root-data multiaccounts)
|
(when (existing-account? root-data multiaccounts)
|
||||||
(show-existing-multiaccount-alert key-uid))
|
(show-existing-multiaccount-alert (:keyUid root-data)))
|
||||||
(navigation/navigate-to-cofx :recover-multiaccount-success nil))))
|
(navigation/navigate-to-cofx :recover-multiaccount-success nil))))
|
||||||
|
|
||||||
(fx/defn enter-phrase-pressed
|
(fx/defn enter-phrase-pressed
|
||||||
|
|
Loading…
Reference in New Issue