From de86586208aa61577aa9f22665e849d574e79a1c Mon Sep 17 00:00:00 2001
From: Roman Volosovskyi <roman.wolosovskyi@gmail.com>
Date: Tue, 28 Mar 2023 10:23:14 +0200
Subject: [PATCH] [#15475] (issue 1) Prevent restoring of an existing multiacc

---
 .../contexts/onboarding/events.cljs           | 30 ++++++++++++++-----
 status-go-version.json                        |  6 ++--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/status_im2/contexts/onboarding/events.cljs b/src/status_im2/contexts/onboarding/events.cljs
index 9e76a086e5..f382402171 100644
--- a/src/status_im2/contexts/onboarding/events.cljs
+++ b/src/status_im2/contexts/onboarding/events.cljs
@@ -5,11 +5,12 @@
     [status-im.utils.types :as types]
     [status-im2.config :as config]
     [clojure.string :as string]
+    [utils.i18n :as i18n]
     [utils.security.core :as security]
     [status-im.native-module.core :as status]
     [status-im.ethereum.core :as ethereum]
     [status-im2.constants :as constants]
-    [utils.i18n :as i18n]))
+    [status-im2.contexts.onboarding.profiles.view :as profiles.view]))
 
 (re-frame/reg-fx
  :multiaccount/create-account-and-login
@@ -22,10 +23,10 @@
    (status/validate-mnemonic
     (security/safe-unmask-data mnemonic)
     (fn [result]
-      (let [{:keys [error]} (types/json->clj result)]
+      (let [{:keys [error keyUID]} (types/json->clj result)]
         (if (seq error)
           (when on-error (on-error error))
-          (on-success mnemonic)))))))
+          (on-success mnemonic keyUID)))))))
 
 (re-frame/reg-fx
  :multiaccount/restore-account-and-login
@@ -121,15 +122,28 @@
   {:events [:onboarding-2/seed-phrase-entered]}
   [_ seed-phrase on-error]
   {:multiaccount/validate-mnemonic [seed-phrase
-                                    #(re-frame/dispatch [:onboarding-2/seed-phrase-validated
-                                                         seed-phrase])
+                                    (fn [mnemonic key-uid]
+                                      (re-frame/dispatch [:onboarding-2/seed-phrase-validated
+                                                          mnemonic key-uid]))
                                     on-error]})
 
 (rf/defn seed-phrase-validated
   {:events [:onboarding-2/seed-phrase-validated]}
-  [{:keys [db]} seed-phrase]
-  {:db       (assoc-in db [:onboarding-2/profile :seed-phrase] seed-phrase)
-   :dispatch [:navigate-to :create-profile]})
+  [{:keys [db]} seed-phrase key-uid]
+  (if (contains? (:multiaccounts/multiaccounts db) key-uid)
+    {: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
   {:events [:onboarding-2/navigate-to-create-profile]}
diff --git a/status-go-version.json b/status-go-version.json
index 9531fab44a..c876cad39c 100644
--- a/status-go-version.json
+++ b/status-go-version.json
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.141.1",
-    "commit-sha1": "458f28178ca15732df8e6c806ef5326fad44427c",
-    "src-sha256": "1hhfswn17dja62rxkb572afd6fsx86wfxs4j666lhscdz7zzs4gx"
+    "version": "v0.141.2",
+    "commit-sha1": "91c6949cd25449d5459581a21f2c8b929290ced0",
+    "src-sha256": "0d4x1y9jhdxy5jn9kqp5avx157iqz4ma7903c3ys0njmnxhmjyf8"
 }