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

[#15475] (issue 1) Prevent restoring of an existing multiacc

This commit is contained in:
Roman Volosovskyi 2023-03-28 10:23:14 +02:00
parent ac2d10bc5d
commit de86586208
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/status_im2/contexts/onboarding/events.cljs
View File

@ -5,11 +5,12 @@
[status-im.utils.types :as types] [status-im.utils.types :as types]
[status-im2.config :as config] [status-im2.config :as config]
[clojure.string :as string] [clojure.string :as string]
[utils.i18n :as i18n]
[utils.security.core :as security] [utils.security.core :as security]
[status-im.native-module.core :as status] [status-im.native-module.core :as status]
[status-im.ethereum.core :as ethereum] [status-im.ethereum.core :as ethereum]
[status-im2.constants :as constants] [status-im2.constants :as constants]
[utils.i18n :as i18n])) [status-im2.contexts.onboarding.profiles.view :as profiles.view]))
(re-frame/reg-fx (re-frame/reg-fx
:multiaccount/create-account-and-login :multiaccount/create-account-and-login
@ -22,10 +23,10 @@
(status/validate-mnemonic (status/validate-mnemonic
(security/safe-unmask-data mnemonic) (security/safe-unmask-data mnemonic)
(fn [result] (fn [result]
(let [{:keys [error]} (types/json->clj result)] (let [{:keys [error keyUID]} (types/json->clj result)]
(if (seq error) (if (seq error)
(when on-error (on-error error)) (when on-error (on-error error))
(on-success mnemonic))))))) (on-success mnemonic keyUID)))))))
(re-frame/reg-fx (re-frame/reg-fx
:multiaccount/restore-account-and-login :multiaccount/restore-account-and-login
@ -121,15 +122,28 @@
{:events [:onboarding-2/seed-phrase-entered]} {:events [:onboarding-2/seed-phrase-entered]}
[_ seed-phrase on-error] [_ seed-phrase on-error]
{:multiaccount/validate-mnemonic [seed-phrase {:multiaccount/validate-mnemonic [seed-phrase
#(re-frame/dispatch [:onboarding-2/seed-phrase-validated (fn [mnemonic key-uid]
seed-phrase]) (re-frame/dispatch [:onboarding-2/seed-phrase-validated
mnemonic key-uid]))
on-error]}) on-error]})
(rf/defn seed-phrase-validated (rf/defn seed-phrase-validated
{:events [:onboarding-2/seed-phrase-validated]} {:events [:onboarding-2/seed-phrase-validated]}
[{:keys [db]} seed-phrase] [{:keys [db]} seed-phrase key-uid]
{:db (assoc-in db [:onboarding-2/profile :seed-phrase] seed-phrase) (if (contains? (:multiaccounts/multiaccounts db) key-uid)
:dispatch [:navigate-to :create-profile]}) {:utils/show-confirmation
{:title (i18n/label :t/multiaccount-exists-title)
:content (i18n/label :t/multiaccount-exists-content)
:confirm-button-text (i18n/label :t/unlock)
:on-accept #(do
(re-frame/dispatch [:pop-to-root :profiles])
;; FIXME(rasom): obviously not cool
(reset! profiles.view/show-profiles? false)
(re-frame/dispatch
[:multiaccounts.login.ui/multiaccount-selected key-uid]))
:on-cancel #(re-frame/dispatch [:pop-to-root :multiaccounts])}}
{:db (assoc-in db [:onboarding-2/profile :seed-phrase] seed-phrase)
:dispatch [:navigate-to :create-profile]}))
(rf/defn navigate-to-create-profile (rf/defn navigate-to-create-profile
{:events [:onboarding-2/navigate-to-create-profile]} {:events [:onboarding-2/navigate-to-create-profile]}

6
status-go-version.json
View File

@ -3,7 +3,7 @@
"_comment": "Instead use: scripts/update-status-go.sh <rev>", "_comment": "Instead use: scripts/update-status-go.sh <rev>",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "v0.141.1", "version": "v0.141.2",
"commit-sha1": "458f28178ca15732df8e6c806ef5326fad44427c", "commit-sha1": "91c6949cd25449d5459581a21f2c8b929290ced0",
"src-sha256": "1hhfswn17dja62rxkb572afd6fsx86wfxs4j666lhscdz7zzs4gx" "src-sha256": "0d4x1y9jhdxy5jn9kqp5avx157iqz4ma7903c3ys0njmnxhmjyf8"
} }