diff --git a/src/status_im/accounts/handlers.cljs b/src/status_im/accounts/handlers.cljs index 900c494954..41e5c47d68 100644 --- a/src/status_im/accounts/handlers.cljs +++ b/src/status_im/accounts/handlers.cljs @@ -36,6 +36,7 @@ (let [data (json->clj result) public-key (:pubkey data) address (:address data) + mnemonic (:mnemonic data) account {:public-key public-key :address address :name address @@ -44,7 +45,8 @@ (when (not (str/blank? public-key)) (do (dispatch-sync [:add-account account]) - (dispatch [:login-account address password]))))) + (dispatch-sync [:save-password password mnemonic]) + (dispatch-sync [:login-account address password]))))) (register-handler :create-account (after #(dispatch [:init-wallet-chat])) diff --git a/src/status_im/chat/handlers.cljs b/src/status_im/chat/handlers.cljs index 9faa0ec5f5..ebba6268de 100644 --- a/src/status_im/chat/handlers.cljs +++ b/src/status_im/chat/handlers.cljs @@ -183,9 +183,8 @@ (init-console-chat db false))) (register-handler :save-password - (fn [db [_ password]] - (sign-up-service/save-password password) - (dispatch [:create-account password]) + (fn [db [_ password mnemonic]] + (sign-up-service/save-password password mnemonic) (assoc db :password-saved true))) (register-handler :sign-up diff --git a/src/status_im/chat/sign_up.cljs b/src/status_im/chat/sign_up.cljs index 65afe63c91..e079e4391d 100644 --- a/src/status_im/chat/sign_up.cljs +++ b/src/status_im/chat/sign_up.cljs @@ -107,7 +107,7 @@ :to "me"}]))) ;; -- Saving password ---------------------------------------- -(defn save-password [password] +(defn save-password [password mnemonic] ;; TODO validate and save password (dispatch [:received-message {:msg-id (random/id) @@ -133,17 +133,14 @@ :from "console" :to "me" :new? false}]) - ;; TODO generate passphrase - (let [passphrase (str "The brash businessman's braggadocio and public squabbing with " - "candidates in the US presidential election")] - (dispatch [:received-message - {:msg-id (random/id) - :content passphrase - :content-type text-content-type - :outgoing false - :from "console" - :to "me" - :new? false}])) + (dispatch [:received-message + {:msg-id (random/id) + :content mnemonic + :content-type text-content-type + :outgoing false + :from "console" + :to "me" + :new? false}]) (dispatch [:received-message {:msg-id "8" :content (label :t/written-down) diff --git a/src/status_im/commands/handlers/jail.cljs b/src/status_im/commands/handlers/jail.cljs index a042ca0b79..1b485f0f60 100644 --- a/src/status_im/commands/handlers/jail.cljs +++ b/src/status_im/commands/handlers/jail.cljs @@ -20,7 +20,7 @@ (def console-events {:save-password (fn [[parameter]] - (dispatch [:save-password parameter])) + (dispatch [:create-account parameter])) :sign-up (fn [[parameter]] (dispatch [:sign-up parameter])) :confirm-sign-up (fn [[parameter]]