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

feat: new keypair: mnemonic, address, KP name screen (#18790) 

feat: new keypair: mnemonic, address, KP name screen (#18790)
This commit is contained in:
Omar Basem 2024-02-21 15:53:14 +04:00 committed by GitHub
parent cfaed80066
commit 28f43acb83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 337 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/react-native-status/android/src/main/java/im/status/ethereum/module/AccountManager.java
View File

@ -342,4 +342,14 @@ public class AccountManager extends ReactContextBaseJavaModule {
final String keyStoreDir = this.utils.getKeyStorePath(keyUID); final String keyStoreDir = this.utils.getKeyStorePath(keyUID);
this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deleteMultiaccount(keyUID, keyStoreDir), callback); this.utils.executeRunnableStatusGoMethod(() -> Statusgo.deleteMultiaccount(keyUID, keyStoreDir), callback);
} }
@ReactMethod
public void getRandomMnemonic(final Callback callback) throws JSONException {
this.utils.executeRunnableStatusGoMethod(() -> Statusgo.getRandomMnemonic(), callback);
}
@ReactMethod
public void createAccountFromMnemonicAndDeriveAccountsForPaths(final String mnemonic, final Callback callback) throws JSONException {
this.utils.executeRunnableStatusGoMethod(() -> Statusgo.createAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic), callback);
}
} }

16
modules/react-native-status/ios/RCTStatus/AccountManager.m
View File

@ -214,4 +214,20 @@ RCT_EXPORT_METHOD(logout) {
NSLog(@"%@", result); NSLog(@"%@", result);
} }
RCT_EXPORT_METHOD(getRandomMnemonic:(RCTResponseSenderBlock)callback) {
#if DEBUG
NSLog(@"GetRandomMnemonic() method called");
#endif
NSString *result = StatusgoGetRandomMnemonic();
callback(@[result]);
}
RCT_EXPORT_METHOD(createAccountFromMnemonicAndDeriveAccountsForPaths:(NSString *)mnemonic callback:(RCTResponseSenderBlock)callback) {
#if DEBUG
NSLog(@"createAccountFromMnemonicAndDeriveAccountsForPaths() method called");
#endif
NSString *result = StatusgoCreateAccountFromMnemonicAndDeriveAccountsForPaths(mnemonic);
callback(@[result]);
}
@end @end

10
src/native_module/core.cljs
View File

@ -573,3 +573,13 @@
(defn init-status-go-logging (defn init-status-go-logging
[{:keys [enable? mobile-system? log-level callback]}] [{:keys [enable? mobile-system? log-level callback]}]
(.initLogging ^js (log-manager) enable? mobile-system? log-level callback)) (.initLogging ^js (log-manager) enable? mobile-system? log-level callback))
(defn get-random-mnemonic
[callback]
(.getRandomMnemonic ^js (account-manager) #(callback (types/json->clj %))))
(defn create-account-from-mnemonic
[mnemonic callback]
(.createAccountFromMnemonicAndDeriveAccountsForPaths ^js (account-manager)
(types/clj->json mnemonic)
#(callback (types/json->clj %))))

52
src/status_im/contexts/wallet/create_account/new_keypair/backup_recovery_phrase/view.cljs
View File

@ -1,11 +1,12 @@
(ns status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.view (ns status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.view
(:require (:require
[clojure.string :as string]
[native-module.core :as native-module]
[quo.core :as quo] [quo.core :as quo]
[quo.theme :as quo.theme] [quo.theme :as quo.theme]
[react-native.blur :as blur] [react-native.blur :as blur]
[react-native.core :as rn] [react-native.core :as rn]
[reagent.core :as reagent] [reagent.core :as reagent]
[status-im.contexts.wallet.common.temp :as temp]
[status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.style :as style] [status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.style :as style]
[utils.i18n :as i18n] [utils.i18n :as i18n]
[utils.re-frame :as rf])) [utils.re-frame :as rf]))
@ -17,7 +18,7 @@
[quo/text {:style {:margin-left 4}} item]]) [quo/text {:style {:margin-left 4}} item]])
(defn- words-column (defn- words-column
[words first-half?] [{:keys [words first-half?]}]
[rn/flat-list [rn/flat-list
{:style {:padding-vertical 8} {:style {:padding-vertical 8}
:data (if first-half? (subvec words 0 6) (subvec words 6)) :data (if first-half? (subvec words 0 6) (subvec words 6))
@ -34,18 +35,24 @@
:on-change #(swap! checked? assoc (keyword (str index)) %)}] :on-change #(swap! checked? assoc (keyword (str index)) %)}]
[quo/text {:style {:margin-left 12}} (i18n/label item)]]) [quo/text {:style {:margin-left 12}} (i18n/label item)]])
(defn- view-internal (defn- f-view
[{:keys [theme]}] [{:keys [theme]}]
(let [step-labels [:t/backup-step-1 :t/backup-step-2 :t/backup-step-3 (let [step-labels [:t/backup-step-1 :t/backup-step-2 :t/backup-step-3
:t/backup-step-4] :t/backup-step-4]
checked? (reagent/atom checked? (reagent/atom
{:0 false {:0 false
:1 false :1 false
:2 false :2 false
:3 false}) :3 false})
revealed? (reagent/atom false) revealed? (reagent/atom false)
{:keys [customization-color]} (rf/sub [:profile/profile])] customization-color (rf/sub [:profile/customization-color])
secret-phrase (reagent/atom [])
random-phrase (reagent/atom [])]
(fn [] (fn []
(rn/use-effect
(fn []
(native-module/get-random-mnemonic #(reset! secret-phrase (string/split % #"\s")))
(native-module/get-random-mnemonic #(reset! random-phrase (string/split % #"\s")))))
[rn/view {:style {:flex 1}} [rn/view {:style {:flex 1}}
[quo/page-nav [quo/page-nav
{:icon-name :i/close {:icon-name :i/close
@ -56,9 +63,15 @@
:description :text :description :text
:description-text (i18n/label :t/backup-recovery-phrase-description)}] :description-text (i18n/label :t/backup-recovery-phrase-description)}]
[rn/view {:style (style/seed-phrase-container theme)} [rn/view {:style (style/seed-phrase-container theme)}
[words-column temp/secret-phrase true] (when (pos? (count @secret-phrase))
[rn/view {:style (style/separator theme)}] [:<>
[words-column temp/secret-phrase false] [words-column
{:words @secret-phrase
:first-half? true}]
[rn/view {:style (style/separator theme)}]
[words-column
{:words @secret-phrase
:first-half? false}]])
(when-not @revealed? (when-not @revealed?
[rn/view {:style style/blur-container} [rn/view {:style style/blur-container}
[blur/view (style/blur theme)]])] [blur/view (style/blur theme)]])]
@ -82,8 +95,9 @@
:button-one-label (i18n/label :t/i-have-written) :button-one-label (i18n/label :t/i-have-written)
:button-one-props {:disabled? (some false? (vals @checked?)) :button-one-props {:disabled? (some false? (vals @checked?))
:customization-color customization-color :customization-color customization-color
:on-press #(rf/dispatch [:navigate-to :on-press #(rf/dispatch [:wallet/store-secret-phrase
:wallet-check-your-backup])}}] {:secret-phrase @secret-phrase
:random-phrase @random-phrase}])}}]
[quo/text [quo/text
{:size :paragraph-2 {:size :paragraph-2
:style (style/description-text theme)} :style (style/description-text theme)}
@ -96,4 +110,8 @@
:on-press #(reset! revealed? true)} :on-press #(reset! revealed? true)}
:container-style style/slide-button}])]))) :container-style style/slide-button}])])))
(defn view-internal
[params]
[:f> f-view params])
(def view (quo.theme/with-theme view-internal)) (def view (quo.theme/with-theme view-internal))

53
src/status_im/contexts/wallet/create_account/new_keypair/check_your_backup/view.cljs
View File

@ -4,7 +4,6 @@
[quo.theme :as quo.theme] [quo.theme :as quo.theme]
[react-native.core :as rn] [react-native.core :as rn]
[reagent.core :as reagent] [reagent.core :as reagent]
[status-im.contexts.wallet.common.temp :as temp]
[status-im.contexts.wallet.create-account.new-keypair.check-your-backup.style :as style] [status-im.contexts.wallet.create-account.new-keypair.check-your-backup.style :as style]
[utils.i18n :as i18n] [utils.i18n :as i18n]
[utils.re-frame :as rf])) [utils.re-frame :as rf]))
@ -31,7 +30,7 @@
(defn- cheat-warning (defn- cheat-warning
[] []
(let [{:keys [customization-color]} (rf/sub [:profile/profile])] (let [customization-color (rf/sub [:profile/customization-color])]
[:<> [:<>
[quo/drawer-top {:title (i18n/label :t/do-not-cheat)}] [quo/drawer-top {:title (i18n/label :t/do-not-cheat)}]
[quo/text [quo/text
@ -62,26 +61,32 @@
(defn- view-internal (defn- view-internal
[] []
(let [random-indices (random-selection) (let [random-indices (random-selection)
quiz-index (reagent/atom 0) quiz-index (reagent/atom 0)
incorrect-count (reagent/atom 0) incorrect-count (reagent/atom 0)
show-error? (reagent/atom false)] show-error? (reagent/atom false)
{:keys [secret-phrase random-phrase]} (rf/sub [:wallet/create-account])]
(fn [] (fn []
(let [current-word-index (get random-indices (min @quiz-index (dec questions-count))) (let [current-word-index (get random-indices
current-word (get temp/secret-phrase current-word-index) (min @quiz-index (dec questions-count)))
[options-r-0 options-r-1] (random-words-with-string temp/random-words current-word) current-word (get secret-phrase current-word-index)
on-button-press (fn [word] [options-row-0 options-row-1] (random-words-with-string random-phrase current-word)
(if (= word current-word) on-button-press (fn [word]
(do (if (= word current-word)
(reset! quiz-index (inc @quiz-index)) (do
(reset! incorrect-count 0) (when (< @quiz-index questions-count)
(reset! show-error? false)) (reset! quiz-index (inc @quiz-index)))
(do (reset! incorrect-count 0)
(when (> @incorrect-count 0) (reset! show-error? false)
(rf/dispatch [:show-bottom-sheet (when (= @quiz-index questions-count)
{:content cheat-warning}])) (rf/dispatch [:navigate-to
(reset! incorrect-count (inc @incorrect-count)) :wallet-keypair-name])))
(reset! show-error? true))))] (do
(when (> @incorrect-count 0)
(rf/dispatch [:show-bottom-sheet
{:content cheat-warning}]))
(reset! incorrect-count (inc @incorrect-count))
(reset! show-error? true))))]
[rn/view {:style {:flex 1}} [rn/view {:style {:flex 1}}
[quo/page-nav [quo/page-nav
{:icon-name :i/arrow-left {:icon-name :i/arrow-left
@ -109,7 +114,7 @@
:else :else
:disabled) :disabled)
:word (get temp/secret-phrase num) :word (get secret-phrase num)
:number (inc num) :number (inc num)
:on-press #(when (= @quiz-index index) :on-press #(when (= @quiz-index index)
(reset! show-error? false))}]) (reset! show-error? false))}])
@ -119,9 +124,9 @@
[buttons-row [buttons-row
{:on-press on-button-press {:on-press on-button-press
:margin-bottom 12 :margin-bottom 12
:options options-r-0}] :options options-row-0}]
[buttons-row [buttons-row
{:on-press on-button-press {:on-press on-button-press
:options options-r-1}]]])))) :options options-row-1}]]]))))
(def view (quo.theme/with-theme view-internal)) (def view (quo.theme/with-theme view-internal))

11
src/status_im/contexts/wallet/create_account/new_keypair/keypair_name/style.cljs Normal file
View File

@ -0,0 +1,11 @@
(ns status-im.contexts.wallet.create-account.new-keypair.keypair-name.style)
(def header-container
{:margin-horizontal 20
:margin-vertical 12})
(def bottom-action
{:position :absolute
:bottom 12
:left 0
:right 0})

40
src/status_im/contexts/wallet/create_account/new_keypair/keypair_name/view.cljs Normal file
View File

@ -0,0 +1,40 @@
(ns status-im.contexts.wallet.create-account.new-keypair.keypair-name.view
(:require
[quo.core :as quo]
[react-native.core :as rn]
[reagent.core :as reagent]
[status-im.contexts.wallet.create-account.new-keypair.keypair-name.style :as style]
[utils.i18n :as i18n]
[utils.re-frame :as rf]))
(def keypair-name-max-length 15)
(defn view
[]
(let [keypair-name (reagent/atom "")]
(fn []
(let [customization-color (rf/sub [:profile/customization-color])]
[rn/view {:style {:flex 1}}
[quo/page-nav
{:icon-name :i/arrow-left
:on-press #(rf/dispatch [:navigate-back])
:accessibility-label :top-bar}]
[quo/text-combinations
{:container-style style/header-container
:title (i18n/label :t/keypair-name)
:description (i18n/label :t/keypair-name-description)}]
[quo/input
{:container-style {:margin-horizontal 20}
:placeholder (i18n/label :t/keypair-name-input-placeholder)
:label (i18n/label :t/keypair-name)
:char-limit keypair-name-max-length
:on-change-text #(reset! keypair-name %)}]
[quo/bottom-actions
{:actions :one-action
:button-one-label (i18n/label :t/continue)
:button-one-props {:disabled? (or (zero? (count @keypair-name))
(> (count @keypair-name) keypair-name-max-length))
:customization-color customization-color
:on-press #(rf/dispatch [:wallet/new-keypair-continue
{:keypair-name @keypair-name}])}
:container-style style/bottom-action}]]))))

178
src/status_im/contexts/wallet/create_account/view.cljs
View File

@ -10,7 +10,6 @@
[status-im.common.emoji-picker.utils :as emoji-picker.utils] [status-im.common.emoji-picker.utils :as emoji-picker.utils]
[status-im.common.standard-authentication.core :as standard-auth] [status-im.common.standard-authentication.core :as standard-auth]
[status-im.constants :as constants] [status-im.constants :as constants]
[status-im.contexts.wallet.common.sheets.account-origin.view :as account-origin]
[status-im.contexts.wallet.common.utils :as utils] [status-im.contexts.wallet.common.utils :as utils]
[status-im.contexts.wallet.create-account.style :as style] [status-im.contexts.wallet.create-account.style :as style]
[status-im.feature-flags :as ff] [status-im.feature-flags :as ff]
@ -20,19 +19,16 @@
[utils.security.core :as security] [utils.security.core :as security]
[utils.string])) [utils.string]))
(defn keypair-string (defn- get-keypair-data
[full-name] [primary-name derivation-path account-color {:keys [keypair-name]}]
(let [first-name (utils/get-first-name full-name)] [{:title (or keypair-name (i18n/label :t/keypair-title {:name primary-name}))
(i18n/label :t/keypair-title {:name first-name}))) :image (if keypair-name :icon :avatar)
:image-props (if keypair-name
(defn get-keypair-data :i/seed
[name derivation-path account-color] {:full-name (utils.string/get-initials primary-name 1)
[{:title (keypair-string name) :size :xxs
:image :avatar :customization-color account-color})
:image-props {:full-name (utils.string/get-initials name 1) :action (when-not keypair-name :button)
:size :xxs
:customization-color account-color}
:action :button
:action-props {:on-press #(ff/alert ::ff/wallet.edit-default-keypair :action-props {:on-press #(ff/alert ::ff/wallet.edit-default-keypair
(fn [] (fn []
(rf/dispatch [:navigate-to :wallet-select-keypair]))) (rf/dispatch [:navigate-to :wallet-select-keypair])))
@ -51,7 +47,7 @@
:description :text :description :text
:description-props {:text (string/replace derivation-path #"/" " / ")}}]) :description-props {:text (string/replace derivation-path #"/" " / ")}}])
(defn- view-internal (defn- f-view
[] []
(let [top (safe-area/get-top) (let [top (safe-area/get-top)
bottom (safe-area/get-bottom) bottom (safe-area/get-bottom)
@ -64,80 +60,86 @@
derivation-path (reagent/atom (utils/get-derivation-path number-of-accounts)) derivation-path (reagent/atom (utils/get-derivation-path number-of-accounts))
{:keys [public-key]} (rf/sub [:profile/profile]) {:keys [public-key]} (rf/sub [:profile/profile])
on-change-text #(reset! account-name %) on-change-text #(reset! account-name %)
[primary-name _] (first (rf/sub [:contacts/contact-two-names-by-identity public-key])) primary-name (first (rf/sub [:contacts/contact-two-names-by-identity public-key]))
{window-width :width} (rn/get-window)] {window-width :width} (rn/get-window)]
(fn [{:keys [theme]}] (fn [{:keys [theme]}]
[rn/view {:style {:flex 1}} (let [{:keys [new-keypair]} (rf/sub [:wallet/create-account])]
[quo/page-nav (rn/use-effect (fn [] #(rf/dispatch [:wallet/clear-new-keypair])))
{:type :no-title [rn/view {:style {:flex 1}}
:background :blur [quo/page-nav
:right-side [{:icon-name :i/info {:type :no-title
:on-press #(rf/dispatch [:show-bottom-sheet :background :blur
{:content account-origin/view}])}] :right-side [{:icon-name :i/info}]
:icon-name :i/close :icon-name :i/close
:on-press #(rf/dispatch [:navigate-back])}] :on-press #(rf/dispatch [:navigate-back])}]
[quo/gradient-cover [quo/gradient-cover
{:customization-color @account-color {:customization-color @account-color
:container-style (style/gradient-cover-container top)}] :container-style (style/gradient-cover-container top)}]
[rn/view [rn/view
{:style style/account-avatar-container} {:style style/account-avatar-container}
[quo/account-avatar [quo/account-avatar
{:customization-color @account-color {:customization-color @account-color
:size 80 :size 80
:emoji @emoji :emoji @emoji
:type :default}] :type :default}]
[quo/button [quo/button
{:size 32 {:size 32
:type :grey :type :grey
:background :photo :background :photo
:icon-only? true :icon-only? true
:on-press #(rf/dispatch [:emoji-picker/open :on-press #(rf/dispatch [:emoji-picker/open
{:on-select (fn [selected-emoji] {:on-select (fn [selected-emoji]
(reset! emoji selected-emoji))}]) (reset! emoji selected-emoji))}])
:container-style style/reaction-button-container} :i/reaction]] :container-style style/reaction-button-container} :i/reaction]]
[quo/title-input [quo/title-input
{:customization-color @account-color {:customization-color @account-color
:placeholder placeholder :placeholder placeholder
:on-change-text on-change-text :on-change-text on-change-text
:max-length constants/wallet-account-name-max-length :max-length constants/wallet-account-name-max-length
:blur? true :blur? true
:disabled? false :disabled? false
:auto-focus true :default-value @account-name
:default-value @account-name :container-style style/title-input-container}]
:container-style style/title-input-container}] [quo/divider-line]
[quo/divider-line] [rn/view
[rn/view {:style style/color-picker-container}
{:style style/color-picker-container} [quo/text
[quo/text {:size :paragraph-2
{:size :paragraph-2 :weight :medium
:weight :medium :style (style/color-label theme)}
:style (style/color-label theme)} (i18n/label :t/colour)]
(i18n/label :t/colour)] [quo/color-picker
[quo/color-picker {:default-selected @account-color
{:default-selected @account-color :on-change #(reset! account-color %)
:on-change #(reset! account-color %) :container-style {:padding-vertical 12
:container-style {:padding-vertical 12 :padding-left (iphone-11-Pro-20-pixel-from-width window-width)}}]]
:padding-left (iphone-11-Pro-20-pixel-from-width window-width)}}]] [quo/divider-line]
[quo/divider-line] [quo/category
[quo/category {:list-type :settings
{:list-type :settings :label (i18n/label :t/origin)
:label (i18n/label :t/origin) :data (get-keypair-data primary-name @derivation-path @account-color new-keypair)}]
:data (get-keypair-data primary-name @derivation-path @account-color)}] [standard-auth/slide-button
[standard-auth/slide-button {:size :size-48
{:size :size-48 :track-text (i18n/label :t/slide-to-create-account)
:track-text (i18n/label :t/slide-to-create-account) :customization-color @account-color
:customization-color @account-color :on-auth-success (fn [entered-password]
:on-auth-success (fn [entered-password] (if new-keypair
(rf/dispatch [:wallet/derive-address-and-add-account (js/alert "Feature under development")
{:sha3-pwd (security/safe-unmask-data entered-password) (rf/dispatch [:wallet/derive-address-and-add-account
:emoji @emoji {:sha3-pwd (security/safe-unmask-data
:color @account-color entered-password)
:path @derivation-path :emoji @emoji
:account-name @account-name}])) :color @account-color
:auth-button-label (i18n/label :t/confirm) :path @derivation-path
;; TODO (@rende11) Add this property when sliding button issue will fixed :account-name @account-name}])))
;; https://github.com/status-im/status-mobile/pull/18683#issuecomment-1941564785 :auth-button-label (i18n/label :t/confirm)
;; :disabled? (empty? @account-name) ;; TODO (@rende11) Add this property when sliding button issue will fixed
:container-style (style/slide-button-container bottom)}]]))) ;; https://github.com/status-im/status-mobile/pull/18683#issuecomment-1941564785
;; :disabled? (empty? @account-name)
:container-style (style/slide-button-container bottom)}]]))))
(defn- view-internal
[]
[:f> f-view])
(def view (quo.theme/with-theme view-internal)) (def view (quo.theme/with-theme view-internal))

16
src/status_im/contexts/wallet/effects.cljs
View File

@ -1,7 +1,19 @@
(ns status-im.contexts.wallet.effects (ns status-im.contexts.wallet.effects
(:require [re-frame.core :as rf] (:require
[react-native.share :as share])) [clojure.string :as string]
[native-module.core :as native-module]
[re-frame.core :as rf]
[react-native.share :as share]))
(rf/reg-fx :effects.share/open (rf/reg-fx :effects.share/open
(fn [content] (fn [content]
(share/open content))) (share/open content)))
(rf/reg-fx
:effects.wallet/create-account-from-mnemonic
(fn [{:keys [secret-phrase keypair-name]}]
(native-module/create-account-from-mnemonic
{:MnemonicPhrase (string/join " " secret-phrase)}
(fn [new-keypair]
(rf/dispatch [:wallet/new-keypair-created
{:new-keypair (assoc new-keypair :keypair-name keypair-name)}])))))

32
src/status_im/contexts/wallet/events.cljs
View File

@ -386,3 +386,35 @@
{:title title {:title title
:subject title :subject title
:message content})]]})) :message content})]]}))
(defn store-secret-phrase
[{:keys [db]} [{:keys [secret-phrase random-phrase]}]]
{:db (-> db
(assoc-in [:wallet :ui :create-account :secret-phrase] secret-phrase)
(assoc-in [:wallet :ui :create-account :random-phrase] random-phrase))
:fx [[:dispatch-later [{:ms 20 :dispatch [:navigate-to :wallet-check-your-backup]}]]]})
(rf/reg-event-fx :wallet/store-secret-phrase store-secret-phrase)
(defn new-keypair-created
[{:keys [db]} [{:keys [new-keypair]}]]
{:db (assoc-in db [:wallet :ui :create-account :new-keypair] new-keypair)
:fx [[:dispatch [:navigate-back-to :wallet-create-account]]]})
(rf/reg-event-fx :wallet/new-keypair-created new-keypair-created)
(defn new-keypair-continue
[{:keys [db]} [{:keys [keypair-name]}]]
(let [secret-phrase (get-in db [:wallet :ui :create-account :secret-phrase])]
{:fx [[:effects.wallet/create-account-from-mnemonic
{:secret-phrase secret-phrase
:keypair-name keypair-name}]]}))
(rf/reg-event-fx :wallet/new-keypair-continue new-keypair-continue)
(defn clear-new-keypair
[{:keys [db]}]
{:db (update-in db [:wallet :ui :create-account] dissoc :new-keypair)})
(rf/reg-event-fx :wallet/clear-new-keypair clear-new-keypair)

32
src/status_im/contexts/wallet/events_test.cljs
View File

@ -24,6 +24,38 @@
result-db (:db effects)] result-db (:db effects)]
(is (match? result-db expected-db)))))) (is (match? result-db expected-db))))))
(deftest store-secret-phrase
(let [db {}
props [{:secret-phrase "test-secret" :random-phrase "random-test"}]
expected-db {:wallet {:ui {:create-account {:secret-phrase "test-secret"
:random-phrase "random-test"}}}}
effects (events/store-secret-phrase {:db db} props)
result-db (:db effects)]
(is (match? result-db expected-db))))
(deftest new-keypair-created
(let [db {}
props [{:new-keypair "test-keypair"}]
expected-db {:wallet {:ui {:create-account {:new-keypair "test-keypair"}}}}
effects (events/new-keypair-created {:db db} props)
result-db (:db effects)]
(is (match? result-db expected-db))))
(deftest new-keypair-continue
(let [db {:wallet {:ui {:create-account {:secret-phrase "test-secret"}}}}
props [{:keypair-name "test-keypair"}]
expected-effects [[:effects.wallet/create-account-from-mnemonic
{:secret-phrase "test-secret" :keypair-name "test-keypair"}]]
effects (events/new-keypair-continue {:db db} props)]
(is (match? effects {:fx expected-effects}))))
(deftest clear-new-keypair
(let [db {:wallet {:ui {:create-account {:new-keypair "test-keypair"}}}}
expected-db {:wallet {:ui {:create-account {}}}}
effects (events/clear-new-keypair {:db db})]
(is (match? (:db effects) expected-db))))
(deftest store-collectibles (deftest store-collectibles
(testing "(displayable-collectible?) helper function" (testing "(displayable-collectible?) helper function"
(let [expected-results [[true (let [expected-results [[true

5
src/status_im/navigation/screens.cljs
View File

@ -63,6 +63,7 @@
wallet-backup-recovery-phrase] wallet-backup-recovery-phrase]
[status-im.contexts.wallet.create-account.new-keypair.check-your-backup.view :as [status-im.contexts.wallet.create-account.new-keypair.check-your-backup.view :as
wallet-check-your-backup] wallet-check-your-backup]
[status-im.contexts.wallet.create-account.new-keypair.keypair-name.view :as wallet-keypair-name]
[status-im.contexts.wallet.create-account.select-keypair.view :as wallet-select-keypair] [status-im.contexts.wallet.create-account.select-keypair.view :as wallet-select-keypair]
[status-im.contexts.wallet.create-account.view :as wallet-create-account] [status-im.contexts.wallet.create-account.view :as wallet-create-account]
[status-im.contexts.wallet.edit-account.view :as wallet-edit-account] [status-im.contexts.wallet.edit-account.view :as wallet-edit-account]
@ -372,6 +373,10 @@
:options {:insets {:top? true :bottom? true}} :options {:insets {:top? true :bottom? true}}
:component wallet-check-your-backup/view} :component wallet-check-your-backup/view}
{:name :wallet-keypair-name
:options {:insets {:top? true :bottom? true}}
:component wallet-keypair-name/view}
{:name :wallet-share-address {:name :wallet-share-address
:options options/transparent-screen-options :options options/transparent-screen-options
:component wallet-share-address/view} :component wallet-share-address/view}

5
src/status_im/subs/wallet/wallet.cljs
View File

@ -38,6 +38,11 @@
:<- [:wallet/ui] :<- [:wallet/ui]
:-> :tokens-loading?) :-> :tokens-loading?)
(rf/reg-sub
:wallet/create-account
:<- [:wallet/ui]
:-> :create-account)
(rf/reg-sub (rf/reg-sub
:wallet/current-viewing-account-address :wallet/current-viewing-account-address
:<- [:wallet] :<- [:wallet]

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.174.8", "version": "v0.175.1",
"commit-sha1": "8a3e71378f7208f75bd688c02b0ae5c43ca600f2", "commit-sha1": "cba3ac570337404e71da0db424d658b6c29f7ad9",
"src-sha256": "10wn93xn6xnkg2d8slyygy9rfrwiargm49738bdjj1g4b81220bq" "src-sha256": "186hpv6lcj4189aa67jvg62gij1z5q42j1qxijijvf3kqnvd4lmq"
} }

6
translations/en.json
View File

@ -2512,5 +2512,9 @@
"origin-desc": "Origin is where your key pair (your private and public key) comes from. You can generate a new key pair or import an existing private key.", "origin-desc": "Origin is where your key pair (your private and public key) comes from. You can generate a new key pair or import an existing private key.",
"derivation-path-header": "Derivation path", "derivation-path-header": "Derivation path",
"derivation-path-desc": "Derivation paths are the routes your Status Wallet uses to generate addresses from your private key.", "derivation-path-desc": "Derivation paths are the routes your Status Wallet uses to generate addresses from your private key.",
"select-networks": "Select networks" "select-networks": "Select networks",
"generating-keypair": "Generating keypair...",
"keypair-name": "Keypair name",
"keypair-name-description": "Name keypair for your own personal reference",
"keypair-name-input-placeholder": "Collectibles account, Old vault...."
} }