chore(wallet): move add-account funcitonality into its own folder

status-im · Apr 8, 2024 · 2e9303f · 2e9303f
1 parent 32098d2
commit 2e9303f
Show file tree

Hide file tree

Showing 33 changed files with 202 additions and 176 deletions.
diff --git a/.../add_address_to_watch/component_spec.cljs → .../add_address_to_watch/component_spec.cljs b/.../add_address_to_watch/component_spec.cljs → .../add_address_to_watch/component_spec.cljs
@@ -1,6 +1,6 @@
-(ns status-im.contexts.wallet.add-address-to-watch.component-spec
+(ns status-im.contexts.wallet.add-account.add-address-to-watch.component-spec
   (:require
-    [status-im.contexts.wallet.add-address-to-watch.view :as add-address-to-watch]
+    [status-im.contexts.wallet.add-account.add-address-to-watch.view :as add-address-to-watch]
     status-im.contexts.wallet.events
     [test-helpers.component :as h]))
 

diff --git a/...watch/confirm_address/component_spec.cljs → ...watch/confirm_address/component_spec.cljs b/...watch/confirm_address/component_spec.cljs → ...watch/confirm_address/component_spec.cljs
@@ -1,6 +1,6 @@
-(ns status-im.contexts.wallet.add-address-to-watch.confirm-address.component-spec
+(ns status-im.contexts.wallet.add-account.add-address-to-watch.confirm-address.component-spec
   (:require
-    [status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address]
+    [status-im.contexts.wallet.add-account.add-address-to-watch.confirm-address.view :as confirm-address]
     [test-helpers.component :as h]))
 
 (h/describe "Add Watch Only Account Page"

diff --git a/...dress_to_watch/confirm_address/style.cljs → ...dress_to_watch/confirm_address/style.cljs b/...dress_to_watch/confirm_address/style.cljs → ...dress_to_watch/confirm_address/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.add-address-to-watch.confirm-address.style)
+(ns status-im.contexts.wallet.add-account.add-address-to-watch.confirm-address.style)
 
 (def container
   {:flex 1})

diff --git a/...ddress_to_watch/confirm_address/view.cljs → ...ddress_to_watch/confirm_address/view.cljs b/...ddress_to_watch/confirm_address/view.cljs → ...ddress_to_watch/confirm_address/view.cljs
@@ -1,12 +1,12 @@
-(ns status-im.contexts.wallet.add-address-to-watch.confirm-address.view
+(ns status-im.contexts.wallet.add-account.add-address-to-watch.confirm-address.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [react-native.core :as rn]
     [reagent.core :as reagent]
     [status-im.common.emoji-picker.utils :as emoji-picker.utils]
-    [status-im.contexts.wallet.add-address-to-watch.confirm-address.style :as style]
+    [status-im.contexts.wallet.add-account.add-address-to-watch.confirm-address.style :as style]
     [status-im.contexts.wallet.common.screen-base.create-or-edit-account.view :as
      create-or-edit-account]
     [utils.i18n :as i18n]

diff --git a/.../add_account/address_to_watch/events.cljs → ..._account/add_address_to_watch/events.cljs b/.../add_account/address_to_watch/events.cljs → ..._account/add_address_to_watch/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.accounts.add-account.address-to-watch.events
+(ns status-im.contexts.wallet.add-account.add-address-to-watch.events
   (:require [clojure.string :as string]
             [status-im.constants :as constants]
             [taoensso.timbre :as log]

diff --git a/...ts/wallet/add_address_to_watch/style.cljs → ...d_account/add_address_to_watch/style.cljs b/...ts/wallet/add_address_to_watch/style.cljs → ...d_account/add_address_to_watch/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.add-address-to-watch.style)
+(ns status-im.contexts.wallet.add-account.add-address-to-watch.style)
 
 (def header-container {:padding-bottom 8})
 

diff --git a/...xts/wallet/add_address_to_watch/view.cljs → ...dd_account/add_address_to_watch/view.cljs b/...xts/wallet/add_address_to_watch/view.cljs → ...dd_account/add_address_to_watch/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.add-address-to-watch.view
+(ns status-im.contexts.wallet.add-account.add-address-to-watch.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
@@ -7,7 +7,7 @@
     [reagent.core :as reagent]
     [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.constants :as constants]
-    [status-im.contexts.wallet.add-address-to-watch.style :as style]
+    [status-im.contexts.wallet.add-account.add-address-to-watch.style :as style]
     [status-im.contexts.wallet.common.validation :as validation]
     [status-im.subs.wallet.add-account.address-to-watch]
     [utils.debounce :as debounce]

diff --git a/.../edit_derivation_path/component_spec.cljs → .../edit_derivation_path/component_spec.cljs b/.../edit_derivation_path/component_spec.cljs → .../edit_derivation_path/component_spec.cljs
@@ -1,6 +1,7 @@
-(ns status-im.contexts.wallet.create-account.edit-derivation-path.component-spec
+(ns status-im.contexts.wallet.add-account.create-account.edit-derivation-path.component-spec
   (:require
-    [status-im.contexts.wallet.create-account.edit-derivation-path.view :as edit-derivation-path]
+    [status-im.contexts.wallet.add-account.create-account.edit-derivation-path.view :as
+     edit-derivation-path]
     [test-helpers.component :as h]))
 
 (def sub-mocks

diff --git a/...rivation_path/path_format_sheet/view.cljs → ...rivation_path/path_format_sheet/view.cljs b/...rivation_path/path_format_sheet/view.cljs → ...rivation_path/path_format_sheet/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.edit-derivation-path.path-format-sheet.view
+(ns status-im.contexts.wallet.add-account.create-account.edit-derivation-path.path-format-sheet.view
   (:require
     [quo.core :as quo]
     [status-im.constants :as constants]

diff --git a/...e_account/edit_derivation_path/style.cljs → ...e_account/edit_derivation_path/style.cljs b/...e_account/edit_derivation_path/style.cljs → ...e_account/edit_derivation_path/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.edit-derivation-path.style
+(ns status-im.contexts.wallet.add-account.create-account.edit-derivation-path.style
   (:require [quo.foundations.colors :as colors]))
 
 (defn screen

diff --git a/...te_account/edit_derivation_path/view.cljs → ...te_account/edit_derivation_path/view.cljs b/...te_account/edit_derivation_path/view.cljs → ...te_account/edit_derivation_path/view.cljs
@@ -1,16 +1,16 @@
-(ns status-im.contexts.wallet.create-account.edit-derivation-path.view
+(ns status-im.contexts.wallet.add-account.create-account.edit-derivation-path.view
   (:require
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
     [reagent.core :as reagent]
+    [status-im.contexts.wallet.add-account.create-account.edit-derivation-path.path-format-sheet.view :as
+     path-format-sheet]
+    [status-im.contexts.wallet.add-account.create-account.edit-derivation-path.style :as style]
     [status-im.contexts.wallet.common.temp :as temp]
     [status-im.contexts.wallet.common.utils :as utils]
-    [status-im.contexts.wallet.create-account.edit-derivation-path.path-format-sheet.view :as
-     path-format-sheet]
-    [status-im.contexts.wallet.create-account.edit-derivation-path.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 

diff --git a/...ontexts/wallet/create_account/events.cljs → ...et/add_account/create_account/events.cljs b/...ontexts/wallet/create_account/events.cljs → ...et/add_account/create_account/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.events
+(ns status-im.contexts.wallet.add-account.create-account.events
   (:require [status-im.contexts.wallet.data-store :as data-store]
             [utils.re-frame :as rf]))
 

diff --git a/...ts/wallet/create_account/events_test.cljs → ...d_account/create_account/events_test.cljs b/...ts/wallet/create_account/events_test.cljs → ...d_account/create_account/events_test.cljs
@@ -1,8 +1,8 @@
-(ns status-im.contexts.wallet.create-account.events-test
+(ns status-im.contexts.wallet.add-account.create-account.events-test
   (:require
     [cljs.test :refer-macros [deftest is]]
     matcher-combinators.test
-    [status-im.contexts.wallet.create-account.events :as events]))
+    [status-im.contexts.wallet.add-account.create-account.events :as events]))
 
 (deftest confirm-account-origin
   (let [db          {:wallet {:ui {:create-account {}}}}

diff --git a/...keypair/backup_recovery_phrase/style.cljs → ...keypair/backup_recovery_phrase/style.cljs b/...keypair/backup_recovery_phrase/style.cljs → ...keypair/backup_recovery_phrase/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.style
+(ns status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.style
   (:require
     [quo.foundations.colors :as colors]
     [quo.theme :as quo.theme]

diff --git a/..._keypair/backup_recovery_phrase/view.cljs → ..._keypair/backup_recovery_phrase/view.cljs b/..._keypair/backup_recovery_phrase/view.cljs → ..._keypair/backup_recovery_phrase/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.view
+(ns status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.view
   (:require
     [clojure.string :as string]
     [native-module.core :as native-module]
@@ -7,7 +7,8 @@
     [react-native.blur :as blur]
     [react-native.core :as rn]
     [reagent.core :as reagent]
-    [status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.style :as style]
+    [status-im.contexts.wallet.add-account.create-account.new-keypair.backup-recovery-phrase.style :as
+     style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 

diff --git a/.../new_keypair/check_your_backup/style.cljs → .../new_keypair/check_your_backup/style.cljs b/.../new_keypair/check_your_backup/style.cljs → .../new_keypair/check_your_backup/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.new-keypair.check-your-backup.style)
+(ns status-im.contexts.wallet.add-account.create-account.new-keypair.check-your-backup.style)
 
 (def header-container
   {:margin-horizontal 20

diff --git a/...t/new_keypair/check_your_backup/view.cljs → ...t/new_keypair/check_your_backup/view.cljs b/...t/new_keypair/check_your_backup/view.cljs → ...t/new_keypair/check_your_backup/view.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.wallet.create-account.new-keypair.check-your-backup.view
+(ns status-im.contexts.wallet.add-account.create-account.new-keypair.check-your-backup.view
   (:require
     [quo.core :as quo]
     [quo.theme :as quo.theme]
     [react-native.core :as rn]
     [reagent.core :as reagent]
-    [status-im.contexts.wallet.create-account.new-keypair.check-your-backup.style :as style]
+    [status-im.contexts.wallet.add-account.create-account.new-keypair.check-your-backup.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 

diff --git a/...count/new_keypair/keypair_name/style.cljs → ...count/new_keypair/keypair_name/style.cljs b/...count/new_keypair/keypair_name/style.cljs → ...count/new_keypair/keypair_name/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.new-keypair.keypair-name.style)
+(ns status-im.contexts.wallet.add-account.create-account.new-keypair.keypair-name.style)
 
 (def header-container
   {:margin-horizontal 20

diff --git a/...ccount/new_keypair/keypair_name/view.cljs → ...ccount/new_keypair/keypair_name/view.cljs b/...ccount/new_keypair/keypair_name/view.cljs → ...ccount/new_keypair/keypair_name/view.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.wallet.create-account.new-keypair.keypair-name.view
+(ns status-im.contexts.wallet.add-account.create-account.new-keypair.keypair-name.view
   (:require
     [quo.core :as quo]
     [react-native.core :as rn]
     [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.common.validation.general :as validators]
-    [status-im.contexts.wallet.create-account.new-keypair.keypair-name.style :as style]
+    [status-im.contexts.wallet.add-account.create-account.new-keypair.keypair-name.style :as style]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 

diff --git a/.../create_account/select_keypair/style.cljs → .../create_account/select_keypair/style.cljs b/.../create_account/select_keypair/style.cljs → .../create_account/select_keypair/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.select-keypair.style)
+(ns status-im.contexts.wallet.add-account.create-account.select-keypair.style)
 
 (def header-container
   {:margin-bottom 8})

diff --git a/...t/create_account/select_keypair/view.cljs → ...t/create_account/select_keypair/view.cljs b/...t/create_account/select_keypair/view.cljs → ...t/create_account/select_keypair/view.cljs
@@ -1,10 +1,10 @@
-(ns status-im.contexts.wallet.create-account.select-keypair.view
+(ns status-im.contexts.wallet.add-account.create-account.select-keypair.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
     [react-native.core :as rn]
     [status-im.constants :as constants]
-    [status-im.contexts.wallet.create-account.select-keypair.style :as style]
+    [status-im.contexts.wallet.add-account.create-account.select-keypair.style :as style]
     [utils.address :as utils]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))

diff --git a/...contexts/wallet/create_account/style.cljs → ...let/add_account/create_account/style.cljs b/...contexts/wallet/create_account/style.cljs → ...let/add_account/create_account/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.style
+(ns status-im.contexts.wallet.add-account.create-account.style
   (:require
     [quo.foundations.colors :as colors]))
 

diff --git a/...contexts/wallet/create_account/utils.cljs → ...let/add_account/create_account/utils.cljs b/...contexts/wallet/create_account/utils.cljs → ...let/add_account/create_account/utils.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.utils)
+(ns status-im.contexts.wallet.add-account.create-account.utils)
 
 (defn prepare-new-keypair
   [{:keys [new-keypair address account-name account-color emoji derivation-path]}]

diff --git a/.../contexts/wallet/create_account/view.cljs → ...llet/add_account/create_account/view.cljs b/.../contexts/wallet/create_account/view.cljs → ...llet/add_account/create_account/view.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.create-account.view
+(ns status-im.contexts.wallet.add-account.create-account.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
@@ -11,9 +11,9 @@
     [status-im.common.floating-button-page.view :as floating-button-page]
     [status-im.common.standard-authentication.core :as standard-auth]
     [status-im.constants :as constants]
+    [status-im.contexts.wallet.add-account.create-account.style :as style]
+    [status-im.contexts.wallet.add-account.create-account.utils :as create-account.utils]
     [status-im.contexts.wallet.common.utils :as utils]
-    [status-im.contexts.wallet.create-account.style :as style]
-    [status-im.contexts.wallet.create-account.utils :as create-account.utils]
     [status-im.contexts.wallet.sheets.account-origin.view :as account-origin]
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]

diff --git a/.../contexts/wallet/events/collectibles.cljs → ...m/contexts/wallet/collectible/events.cljs b/.../contexts/wallet/events/collectibles.cljs → ...m/contexts/wallet/collectible/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.events.collectibles
+(ns status-im.contexts.wallet.collectible.events
   (:require [camel-snake-kebab.extras :as cske]
             [taoensso.timbre :as log]
             [utils.ethereum.chain :as chain]

diff --git a/src/status_im/contexts/wallet/common/wizard/events.cljs b/src/status_im/contexts/wallet/common/wizard/events.cljs
@@ -0,0 +1,22 @@
+(ns status-im.contexts.wallet.common.wizard.events
+  (:require [status-im.contexts.wallet.send.flow-config :as wallet-flow]
+            [utils.re-frame :as rf]))
+
+(defn- wizard-find-next-screen
+  [db flow-id current-screen]
+  (let [flow-config (case flow-id
+                      :wallet-flow wallet-flow/steps
+                      nil)]
+    (first (filter (fn [{:keys [skip-step? screen-id]}]
+                     (and (not= screen-id current-screen)
+                          (not (and (fn? skip-step?) (skip-step? db)))))
+                   flow-config))))
+
+(rf/reg-event-fx
+ :wallet/wizard-navigate-forward
+ (fn [{:keys [db]} [{:keys [current-screen flow-id start-flow?]}]]
+   (let [next-screen (wizard-find-next-screen db flow-id current-screen)]
+     {:fx [[:dispatch
+            (if start-flow?
+              [:open-modal (:screen-id next-screen)]
+              [:navigate-to-within-stack [(:screen-id next-screen) current-screen]])]]})))
diff --git a/src/status_im/contexts/wallet/events.cljs b/src/status_im/contexts/wallet/events.cljs
@@ -4,11 +4,9 @@
     [react-native.background-timer :as background-timer]
     [react-native.platform :as platform]
     [status-im.constants :as constants]
-    [status-im.contexts.wallet.accounts.add-account.address-to-watch.events]
     [status-im.contexts.wallet.common.utils :as utils]
     [status-im.contexts.wallet.data-store :as data-store]
     [status-im.contexts.wallet.db :as db]
-    [status-im.contexts.wallet.events.collectibles]
     [status-im.contexts.wallet.item-types :as item-types]
     [taoensso.timbre :as log]
     [utils.collection]

diff --git a/...ntexts/wallet/events/saved_addresses.cljs → .../contexts/wallet/save_address/events.cljs b/...ntexts/wallet/events/saved_addresses.cljs → .../contexts/wallet/save_address/events.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.events.saved-addresses
+(ns status-im.contexts.wallet.save-address.events
   (:require
     [status-im.constants :as constants]
     [utils.re-frame :as rf]))

diff --git a/...texts/wallet/send/save_address/style.cljs → ...m/contexts/wallet/save_address/style.cljs b/...texts/wallet/send/save_address/style.cljs → ...m/contexts/wallet/save_address/style.cljs
@@ -1,4 +1,4 @@
-(ns status-im.contexts.wallet.send.save-address.style)
+(ns status-im.contexts.wallet.save-address.style)
 
 (def title-input-container
   {:padding-horizontal 20

diff --git a/...ntexts/wallet/send/save_address/view.cljs → ...im/contexts/wallet/save_address/view.cljs b/...ntexts/wallet/send/save_address/view.cljs → ...im/contexts/wallet/save_address/view.cljs
@@ -1,11 +1,11 @@
-(ns status-im.contexts.wallet.send.save-address.view
+(ns status-im.contexts.wallet.save-address.view
   (:require
     [clojure.string :as string]
     [quo.core :as quo]
     [quo.theme]
     [react-native.core :as rn]
     [status-im.common.floating-button-page.view :as floating-button-page]
-    [status-im.contexts.wallet.send.save-address.style :as style]
+    [status-im.contexts.wallet.save-address.style :as style]
     [status-im.contexts.wallet.sheets.network-preferences.view
      :as network-preferences]
     [utils.i18n :as i18n]

diff --git a/src/status_im/core_spec.cljs b/src/status_im/core_spec.cljs
@@ -1,10 +1,10 @@
 (ns status-im.core-spec
   (:require
-    [status-im.common.floating-button-page.component-spec]
-    [status-im.contexts.chat.messenger.messages.content.audio.component-spec]
-    [status-im.contexts.communities.actions.community-options.component-spec]
-    [status-im.contexts.shell.share.wallet.component-spec]
-    [status-im.contexts.wallet.add-address-to-watch.component-spec]
-    [status-im.contexts.wallet.add-address-to-watch.confirm-address.component-spec]
-    [status-im.contexts.wallet.create-account.edit-derivation-path.component-spec]
-    [status-im.contexts.wallet.send.input-amount.component-spec]))
+   [status-im.common.floating-button-page.component-spec]
+   [status-im.contexts.chat.messenger.messages.content.audio.component-spec]
+   [status-im.contexts.communities.actions.community-options.component-spec]
+   [status-im.contexts.shell.share.wallet.component-spec]
+   [status-im.contexts.wallet.add-account.add-address-to-watch.component-spec]
+   [status-im.contexts.wallet.add-account.add-address-to-watch.confirm-address.component-spec]
+   [status-im.contexts.wallet.add-account.create-account.edit-derivation-path.component-spec]
+   [status-im.contexts.wallet.send.input-amount.component-spec]))