From ce104a1c30206609ce6c61f6a3721313901e9894 Mon Sep 17 00:00:00 2001 From: Ulises M Date: Wed, 22 May 2024 11:26:17 -0600 Subject: [PATCH] Remove duplcated constant --- src/status_im/constants.cljs | 2 -- .../contexts/wallet/add_account/create_account/events.cljs | 2 +- .../contexts/wallet/add_account/create_account/events_test.cljs | 2 +- .../contexts/wallet/add_account/create_account/utils.cljs | 2 +- .../contexts/wallet/add_account/create_account/view.cljs | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/status_im/constants.cljs b/src/status_im/constants.cljs index 8f55d2b1c84..7d48515aede 100644 --- a/src/status_im/constants.cljs +++ b/src/status_im/constants.cljs @@ -208,8 +208,6 @@ (def ^:const path-ledger-live "m/44'/60'") (def ^:const path-keepkey "m/44'/60'") -(def ^:const wallet-initial-derivation-path "m/44'/60'/0'/0/0") - (def ^:const path-default-wallet-keyword (keyword path-default-wallet)) (def ^:const path-whisper-keyword (keyword path-whisper)) (def ^:const path-wallet-root-keyword (keyword path-wallet-root)) diff --git a/src/status_im/contexts/wallet/add_account/create_account/events.cljs b/src/status_im/contexts/wallet/add_account/create_account/events.cljs index a0441b2a236..5673cf6a64f 100644 --- a/src/status_im/contexts/wallet/add_account/create_account/events.cljs +++ b/src/status_im/contexts/wallet/add_account/create_account/events.cljs @@ -77,7 +77,7 @@ (let [seed-phrase (-> db :wallet :ui :create-account :new-keypair :seed-phrase)] {:fx [[:effects.wallet/create-account-from-mnemonic {:mnemonic-phrase (security/safe-unmask-data seed-phrase) - :paths [constants/wallet-initial-derivation-path] + :paths [constants/path-default-wallet] :on-success (fn [new-account-data] (rf/dispatch [:wallet/store-account-generated {:new-account-data new-account-data diff --git a/src/status_im/contexts/wallet/add_account/create_account/events_test.cljs b/src/status_im/contexts/wallet/add_account/create_account/events_test.cljs index f721dd23082..09287371571 100644 --- a/src/status_im/contexts/wallet/add_account/create_account/events_test.cljs +++ b/src/status_im/contexts/wallet/add_account/create_account/events_test.cljs @@ -60,7 +60,7 @@ props [{:keypair-name "test-keypair"}] expected-effects [[:effects.wallet/create-account-from-mnemonic {:mnemonic-phrase "test-secret" - :paths [constants/wallet-initial-derivation-path]}]] + :paths [constants/path-default-wallet]}]] effects (events/generate-account-for-keypair {:db db} props)] (is (match? (update-in effects [:fx 0 1] dissoc :on-success) diff --git a/src/status_im/contexts/wallet/add_account/create_account/utils.cljs b/src/status_im/contexts/wallet/add_account/create_account/utils.cljs index cc160ec0be7..121cbc34a68 100644 --- a/src/status_im/contexts/wallet/add_account/create_account/utils.cljs +++ b/src/status_im/contexts/wallet/add_account/create_account/utils.cljs @@ -15,7 +15,7 @@ :wallet false :chat false :type :seed - :path constants/wallet-initial-derivation-path + :path constants/path-default-wallet :public-key (:publicKey account-to-create) :name account-name :emoji emoji diff --git a/src/status_im/contexts/wallet/add_account/create_account/view.cljs b/src/status_im/contexts/wallet/add_account/create_account/view.cljs index 50b580af896..a0661c54e40 100644 --- a/src/status_im/contexts/wallet/add_account/create_account/view.cljs +++ b/src/status_im/contexts/wallet/add_account/create_account/view.cljs @@ -183,7 +183,7 @@ {:account-color @account-color :set-account-color set-account-color}] [new-account-origin - {:derivation-path constants/wallet-initial-derivation-path + {:derivation-path constants/path-default-wallet :customization-color customization-color :keypair-title keypair-name}]]))))