From e9bbb3479722be54a234c16004ae07413a3ca936 Mon Sep 17 00:00:00 2001 From: Jamie Caprani Date: Fri, 29 Mar 2024 13:21:01 +0000 Subject: [PATCH] chore(wallet): clean up root folder (#19417) --- .../{ => account}/edit_account/style.cljs | 2 +- .../{ => account}/edit_account/view.cljs | 4 ++-- .../wallet/account/share_address/style.cljs | 3 +++ .../{ => account}/share_address/view.cljs | 4 ++-- .../{ => common}/scan_account/view.cljs | 2 +- .../contexts/wallet/saved_address/view.cljs | 16 ---------------- .../contexts/wallet/saved_addresses/view.cljs | 19 ------------------- .../contexts/wallet/share_address/style.cljs | 3 --- src/status_im/navigation/screens.cljs | 10 +++------- 9 files changed, 12 insertions(+), 51 deletions(-) rename src/status_im/contexts/wallet/{ => account}/edit_account/style.cljs (53%) rename src/status_im/contexts/wallet/{ => account}/edit_account/view.cljs (97%) create mode 100644 src/status_im/contexts/wallet/account/share_address/style.cljs rename src/status_im/contexts/wallet/{ => account}/share_address/view.cljs (97%) rename src/status_im/contexts/wallet/{ => common}/scan_account/view.cljs (95%) delete mode 100644 src/status_im/contexts/wallet/saved_address/view.cljs delete mode 100644 src/status_im/contexts/wallet/saved_addresses/view.cljs delete mode 100644 src/status_im/contexts/wallet/share_address/style.cljs diff --git a/src/status_im/contexts/wallet/edit_account/style.cljs b/src/status_im/contexts/wallet/account/edit_account/style.cljs similarity index 53% rename from src/status_im/contexts/wallet/edit_account/style.cljs rename to src/status_im/contexts/wallet/account/edit_account/style.cljs index a00dfffbd3..2230fdffce 100644 --- a/src/status_im/contexts/wallet/edit_account/style.cljs +++ b/src/status_im/contexts/wallet/account/edit_account/style.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.edit-account.style) +(ns status-im.contexts.wallet.account.edit-account.style) (def data-item {:margin-horizontal 20 diff --git a/src/status_im/contexts/wallet/edit_account/view.cljs b/src/status_im/contexts/wallet/account/edit_account/view.cljs similarity index 97% rename from src/status_im/contexts/wallet/edit_account/view.cljs rename to src/status_im/contexts/wallet/account/edit_account/view.cljs index 03343446ca..48565023db 100644 --- a/src/status_im/contexts/wallet/edit_account/view.cljs +++ b/src/status_im/contexts/wallet/account/edit_account/view.cljs @@ -1,10 +1,10 @@ -(ns status-im.contexts.wallet.edit-account.view +(ns status-im.contexts.wallet.account.edit-account.view (:require [quo.core :as quo] [react-native.core :as rn] [reagent.core :as reagent] + [status-im.contexts.wallet.account.edit-account.style :as style] [status-im.contexts.wallet.common.screen-base.create-or-edit-account.view :as create-or-edit-account] - [status-im.contexts.wallet.edit-account.style :as style] [status-im.contexts.wallet.sheets.network-preferences.view :as network-preferences] [status-im.contexts.wallet.sheets.remove-account.view :as remove-account] diff --git a/src/status_im/contexts/wallet/account/share_address/style.cljs b/src/status_im/contexts/wallet/account/share_address/style.cljs new file mode 100644 index 0000000000..c51e68f913 --- /dev/null +++ b/src/status_im/contexts/wallet/account/share_address/style.cljs @@ -0,0 +1,3 @@ +(ns status-im.contexts.wallet.account.share-address.style) + +(def header-container {:margin-bottom 8}) diff --git a/src/status_im/contexts/wallet/share_address/view.cljs b/src/status_im/contexts/wallet/account/share_address/view.cljs similarity index 97% rename from src/status_im/contexts/wallet/share_address/view.cljs rename to src/status_im/contexts/wallet/account/share_address/view.cljs index 9784dc24b0..368b160615 100644 --- a/src/status_im/contexts/wallet/share_address/view.cljs +++ b/src/status_im/contexts/wallet/account/share_address/view.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.share-address.view +(ns status-im.contexts.wallet.account.share-address.view (:require [quo.core :as quo] [react-native.core :as rn] @@ -6,8 +6,8 @@ [react-native.safe-area :as safe-area] [react-native.share :as share] [reagent.core :as reagent] + [status-im.contexts.wallet.account.share-address.style :as style] [status-im.contexts.wallet.common.utils :as utils] - [status-im.contexts.wallet.share-address.style :as style] [status-im.contexts.wallet.sheets.network-preferences.view :as network-preferences] [utils.i18n :as i18n] [utils.image-server :as image-server] diff --git a/src/status_im/contexts/wallet/scan_account/view.cljs b/src/status_im/contexts/wallet/common/scan_account/view.cljs similarity index 95% rename from src/status_im/contexts/wallet/scan_account/view.cljs rename to src/status_im/contexts/wallet/common/scan_account/view.cljs index 4ee89c9806..688b1b76cc 100644 --- a/src/status_im/contexts/wallet/scan_account/view.cljs +++ b/src/status_im/contexts/wallet/common/scan_account/view.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.scan-account.view +(ns status-im.contexts.wallet.common.scan-account.view (:require [status-im.common.scan-qr-code.view :as scan-qr-code] [status-im.constants :as constants] [utils.debounce :as debounce] diff --git a/src/status_im/contexts/wallet/saved_address/view.cljs b/src/status_im/contexts/wallet/saved_address/view.cljs deleted file mode 100644 index 29868dc72e..0000000000 --- a/src/status_im/contexts/wallet/saved_address/view.cljs +++ /dev/null @@ -1,16 +0,0 @@ -(ns status-im.contexts.wallet.saved-address.view - (:require - [quo.core :as quo] - [re-frame.core :as rf] - [react-native.core :as rn])) - -(defn view - [] - [rn/view - {:style {:flex 1 - :align-items :center - :justify-content :center}} - - [quo/text {} "SAVED ADDRESS"] - [quo/button {:on-press #(rf/dispatch [:navigate-back])} - "NAVIGATE BACK"]]) diff --git a/src/status_im/contexts/wallet/saved_addresses/view.cljs b/src/status_im/contexts/wallet/saved_addresses/view.cljs deleted file mode 100644 index 79b82a731a..0000000000 --- a/src/status_im/contexts/wallet/saved_addresses/view.cljs +++ /dev/null @@ -1,19 +0,0 @@ -(ns status-im.contexts.wallet.saved-addresses.view - (:require - [quo.core :as quo] - [re-frame.core :as rf] - [react-native.core :as rn])) - -(defn view - [] - [rn/view - {:style {:flex 1 - :align-items :center - :justify-content :center}} - - [quo/text {} "SAVED ADDRESSES"] - [quo/button {:on-press #(rf/dispatch [:navigate-to :wallet-saved-address])} - "NAVIGATE TO SAVED ADDRESS"] - [quo/divider-label] - [quo/button {:on-press #(rf/dispatch [:navigate-back])} - "NAVIGATE BACK"]]) diff --git a/src/status_im/contexts/wallet/share_address/style.cljs b/src/status_im/contexts/wallet/share_address/style.cljs deleted file mode 100644 index 4e30e0b96d..0000000000 --- a/src/status_im/contexts/wallet/share_address/style.cljs +++ /dev/null @@ -1,3 +0,0 @@ -(ns status-im.contexts.wallet.share-address.style) - -(def header-container {:margin-bottom 8}) diff --git a/src/status_im/navigation/screens.cljs b/src/status_im/navigation/screens.cljs index 267e156a62..22d1e655b0 100644 --- a/src/status_im/navigation/screens.cljs +++ b/src/status_im/navigation/screens.cljs @@ -55,6 +55,8 @@ [status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page] [status-im.contexts.syncing.setup-syncing.view :as settings-setup-syncing] [status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing] + [status-im.contexts.wallet.account.edit-account.view :as wallet-edit-account] + [status-im.contexts.wallet.account.share-address.view :as wallet-share-address] [status-im.contexts.wallet.account.view :as wallet-accounts] [status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as wallet-confirm-address-to-watch] @@ -63,6 +65,7 @@ [status-im.contexts.wallet.bridge.input-amount.view :as wallet-bridge-input-amount] [status-im.contexts.wallet.bridge.select-asset.view :as wallet-bridge-select-asset] [status-im.contexts.wallet.collectible.view :as wallet-collectible] + [status-im.contexts.wallet.common.scan-account.view :as wallet-scan-address] [status-im.contexts.wallet.create-account.edit-derivation-path.view :as wallet-edit-derivation-path] [status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.view :as wallet-backup-recovery-phrase] @@ -71,9 +74,6 @@ [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.view :as wallet-create-account] - [status-im.contexts.wallet.edit-account.view :as wallet-edit-account] - [status-im.contexts.wallet.saved-addresses.view :as wallet-saved-addresses] - [status-im.contexts.wallet.scan-account.view :as wallet-scan-address] [status-im.contexts.wallet.send.save-address.view :as wallet-save-address] [status-im.contexts.wallet.send.select-address.view :as wallet-select-address] [status-im.contexts.wallet.send.select-asset.view :as wallet-select-asset] @@ -81,7 +81,6 @@ [status-im.contexts.wallet.send.send-amount.view :as wallet-send-input-amount] [status-im.contexts.wallet.send.transaction-confirmation.view :as wallet-transaction-confirmation] [status-im.contexts.wallet.send.transaction-progress.view :as wallet-transaction-progress] - [status-im.contexts.wallet.share-address.view :as wallet-share-address] [status-im.navigation.options :as options] [status-im.navigation.transitions :as transitions])) @@ -404,9 +403,6 @@ :options options/transparent-screen-options :component wallet-share-address/view} - {:name :screen/wallet.saved-addresses - :component wallet-saved-addresses/view} - {:name :screen/wallet.save-address :options {:sheet? true} :component wallet-save-address/view}