diff --git a/src/status_im/contexts/shell/share/wallet/view.cljs b/src/status_im/contexts/shell/share/wallet/view.cljs index f5ff9148c2..62b3c1b08e 100644 --- a/src/status_im/contexts/shell/share/wallet/view.cljs +++ b/src/status_im/contexts/shell/share/wallet/view.cljs @@ -7,8 +7,8 @@ [reagent.core :as reagent] [status-im.contexts.shell.share.style :as style] [status-im.contexts.shell.share.wallet.style :as wallet-style] - [status-im.contexts.wallet.common.sheets.network-preferences.view :as network-preferences] [status-im.contexts.wallet.common.utils :as utils] + [status-im.contexts.wallet.sheets.network-preferences.view :as network-preferences] [utils.i18n :as i18n] [utils.image-server :as image-server] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/common/account_switcher/view.cljs b/src/status_im/contexts/wallet/common/account_switcher/view.cljs index 9990675cb7..bae23f9255 100644 --- a/src/status_im/contexts/wallet/common/account_switcher/view.cljs +++ b/src/status_im/contexts/wallet/common/account_switcher/view.cljs @@ -1,8 +1,8 @@ (ns status-im.contexts.wallet.common.account-switcher.view (:require [quo.core :as quo] - [status-im.contexts.wallet.common.sheets.account-options.view :as account-options] - [status-im.contexts.wallet.common.sheets.network-filter.view :as network-filter] - [status-im.contexts.wallet.common.sheets.select-account.view :as select-account] + [status-im.contexts.wallet.sheets.account-options.view :as account-options] + [status-im.contexts.wallet.sheets.network-filter.view :as network-filter] + [status-im.contexts.wallet.sheets.select-account.view :as select-account] [status-im.feature-flags :as ff] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/common/sheets/select_account/style.cljs b/src/status_im/contexts/wallet/common/sheets/select_account/style.cljs deleted file mode 100644 index 58a08cc0f0..0000000000 --- a/src/status_im/contexts/wallet/common/sheets/select_account/style.cljs +++ /dev/null @@ -1,4 +0,0 @@ -(ns status-im.contexts.wallet.common.sheets.select-account.style) - -(def list-container - {:margin-horizontal 8}) diff --git a/src/status_im/contexts/wallet/create_account/view.cljs b/src/status_im/contexts/wallet/create_account/view.cljs index 9ca83078b8..b2f64c92b5 100644 --- a/src/status_im/contexts/wallet/create_account/view.cljs +++ b/src/status_im/contexts/wallet/create_account/view.cljs @@ -10,10 +10,10 @@ [status-im.common.emoji-picker.utils :as emoji-picker.utils] [status-im.common.standard-authentication.core :as standard-auth] [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.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] [utils.responsiveness :refer [iphone-11-Pro-20-pixel-from-width]] diff --git a/src/status_im/contexts/wallet/edit_account/view.cljs b/src/status_im/contexts/wallet/edit_account/view.cljs index e54a8cfb01..54ca0068c8 100644 --- a/src/status_im/contexts/wallet/edit_account/view.cljs +++ b/src/status_im/contexts/wallet/edit_account/view.cljs @@ -5,10 +5,10 @@ [reagent.core :as reagent] [status-im.contexts.wallet.common.screen-base.create-or-edit-account.view :as create-or-edit-account] - [status-im.contexts.wallet.common.sheets.network-preferences.view - :as network-preferences] - [status-im.contexts.wallet.common.sheets.remove-account.view :as remove-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] [status-im.feature-flags :as ff] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/home/view.cljs b/src/status_im/contexts/wallet/home/view.cljs index 611fc6c31c..88705d86d0 100644 --- a/src/status_im/contexts/wallet/home/view.cljs +++ b/src/status_im/contexts/wallet/home/view.cljs @@ -4,9 +4,9 @@ [react-native.core :as rn] [reagent.core :as reagent] [status-im.common.home.top-nav.view :as common.top-nav] - [status-im.contexts.wallet.common.sheets.network-filter.view :as network-filter] [status-im.contexts.wallet.home.style :as style] [status-im.contexts.wallet.home.tabs.view :as tabs] + [status-im.contexts.wallet.sheets.network-filter.view :as network-filter] [status-im.feature-flags :as ff] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/send/events.cljs b/src/status_im/contexts/wallet/send/events.cljs index 8d4107653e..9222404e90 100644 --- a/src/status_im/contexts/wallet/send/events.cljs +++ b/src/status_im/contexts/wallet/send/events.cljs @@ -45,20 +45,13 @@ (update-in [:wallet :ui :send] dissoc :route) (update-in [:wallet :ui :send] dissoc :loading-suggested-routes?))})) -(rf/reg-event-fx :wallet/select-send-account-address - (fn [{:keys [db]} [{:keys [address stack-id]}]] - {:db (-> db - (assoc-in [:wallet :ui :send :send-account-address] address) - (update-in [:wallet :ui :send] dissoc :to-address)) - :fx [[:dispatch [:navigate-to-within-stack [:wallet-select-asset stack-id]]]]})) - (rf/reg-event-fx :wallet/clean-send-address (fn [{:keys [db]}] {:db (update-in db [:wallet :ui :send] dissoc :recipient :to-address)})) (rf/reg-event-fx :wallet/select-send-address - (fn [{:keys [db]} [{:keys [address token recipient stack-id]}]] + (fn [{:keys [db]} [{:keys [address token? recipient stack-id]}]] (let [[prefix to-address] (utils/split-prefix-and-address address) test-net? (get-in db [:profile/profile :test-networks-enabled?]) goerli-enabled? (get-in db [:profile/profile :is-goerli-enabled?]) @@ -73,7 +66,7 @@ (assoc-in [:wallet :ui :send :selected-networks] selected-networks)) :fx [[:dispatch [:navigate-to-within-stack - (if token + (if token? [:wallet-send-input-amount stack-id] [:wallet-select-asset stack-id])]]]}))) diff --git a/src/status_im/contexts/wallet/send/select_address/tabs/view.cljs b/src/status_im/contexts/wallet/send/select_address/tabs/view.cljs index c517e3ee46..7debbe7c9d 100644 --- a/src/status_im/contexts/wallet/send/select_address/tabs/view.cljs +++ b/src/status_im/contexts/wallet/send/select_address/tabs/view.cljs @@ -14,6 +14,7 @@ {:account-props (assoc account :customization-color color) :on-press #(rf/dispatch [:wallet/select-send-address {:address address + :token? false :recipient account :stack-id :wallet-select-address}])}]) diff --git a/src/status_im/contexts/wallet/send/select_address/view.cljs b/src/status_im/contexts/wallet/send/select_address/view.cljs index d715900899..da218485d1 100644 --- a/src/status_im/contexts/wallet/send/select_address/view.cljs +++ b/src/status_im/contexts/wallet/send/select_address/view.cljs @@ -93,6 +93,7 @@ (when-not ens (rf/dispatch [:wallet/select-send-address {:address address + :token? false :recipient local-suggestion :stack-id :wallet-select-address}])))) :active-state? false}] @@ -156,7 +157,7 @@ :disabled? (not valid-ens-or-address?) :on-press #(rf/dispatch [:wallet/select-send-address {:address @input-value - :token token + :token? (some? token) :stack-id :wallet-select-address}]) :customization-color color} diff --git a/src/status_im/contexts/wallet/share_address/view.cljs b/src/status_im/contexts/wallet/share_address/view.cljs index e306b1eeaa..76a8eb13e6 100644 --- a/src/status_im/contexts/wallet/share_address/view.cljs +++ b/src/status_im/contexts/wallet/share_address/view.cljs @@ -6,9 +6,9 @@ [react-native.safe-area :as safe-area] [react-native.share :as share] [reagent.core :as reagent] - [status-im.contexts.wallet.common.sheets.network-preferences.view :as network-preferences] [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] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/common/sheets/account_options/style.cljs b/src/status_im/contexts/wallet/sheets/account_options/style.cljs similarity index 89% rename from src/status_im/contexts/wallet/common/sheets/account_options/style.cljs rename to src/status_im/contexts/wallet/sheets/account_options/style.cljs index 6528684982..d97fabcba7 100644 --- a/src/status_im/contexts/wallet/common/sheets/account_options/style.cljs +++ b/src/status_im/contexts/wallet/sheets/account_options/style.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.common.sheets.account-options.style) +(ns status-im.contexts.wallet.sheets.account-options.style) (def drawer-section-label {:padding-horizontal 20 diff --git a/src/status_im/contexts/wallet/common/sheets/account_options/view.cljs b/src/status_im/contexts/wallet/sheets/account_options/view.cljs similarity index 96% rename from src/status_im/contexts/wallet/common/sheets/account_options/view.cljs rename to src/status_im/contexts/wallet/sheets/account_options/view.cljs index d91b245c57..37f9403e42 100644 --- a/src/status_im/contexts/wallet/common/sheets/account_options/view.cljs +++ b/src/status_im/contexts/wallet/sheets/account_options/view.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.common.sheets.account-options.view +(ns status-im.contexts.wallet.sheets.account-options.view (:require [oops.core :as oops] [quo.core :as quo] [quo.foundations.colors :as colors] @@ -9,9 +9,9 @@ [react-native.gesture :as gesture] [react-native.platform :as platform] [reagent.core :as reagent] - [status-im.contexts.wallet.common.sheets.account-options.style :as style] - [status-im.contexts.wallet.common.sheets.remove-account.view :as remove-account] [status-im.contexts.wallet.common.utils :as utils] + [status-im.contexts.wallet.sheets.account-options.style :as style] + [status-im.contexts.wallet.sheets.remove-account.view :as remove-account] [status-im.feature-flags :as ff] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/common/sheets/account_origin/style.cljs b/src/status_im/contexts/wallet/sheets/account_origin/style.cljs similarity index 88% rename from src/status_im/contexts/wallet/common/sheets/account_origin/style.cljs rename to src/status_im/contexts/wallet/sheets/account_origin/style.cljs index c74abd8cae..58253e83f3 100644 --- a/src/status_im/contexts/wallet/common/sheets/account_origin/style.cljs +++ b/src/status_im/contexts/wallet/sheets/account_origin/style.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.common.sheets.account-origin.style +(ns status-im.contexts.wallet.sheets.account-origin.style (:require [react-native.platform :as platform])) (def header-container diff --git a/src/status_im/contexts/wallet/common/sheets/account_origin/view.cljs b/src/status_im/contexts/wallet/sheets/account_origin/view.cljs similarity index 88% rename from src/status_im/contexts/wallet/common/sheets/account_origin/view.cljs rename to src/status_im/contexts/wallet/sheets/account_origin/view.cljs index 9580442d3b..bd47b9cfb5 100644 --- a/src/status_im/contexts/wallet/common/sheets/account_origin/view.cljs +++ b/src/status_im/contexts/wallet/sheets/account_origin/view.cljs @@ -1,10 +1,10 @@ -(ns status-im.contexts.wallet.common.sheets.account-origin.view +(ns status-im.contexts.wallet.sheets.account-origin.view (:require [quo.core :as quo] [quo.theme] [react-native.core :as rn] [status-im.constants :as const] - [status-im.contexts.wallet.common.sheets.account-origin.style :as style] + [status-im.contexts.wallet.sheets.account-origin.style :as style] [utils.i18n :as i18n])) (defn- header diff --git a/src/status_im/contexts/wallet/common/sheets/network_filter/view.cljs b/src/status_im/contexts/wallet/sheets/network_filter/view.cljs similarity index 97% rename from src/status_im/contexts/wallet/common/sheets/network_filter/view.cljs rename to src/status_im/contexts/wallet/sheets/network_filter/view.cljs index 0c192e2328..0084341784 100644 --- a/src/status_im/contexts/wallet/common/sheets/network_filter/view.cljs +++ b/src/status_im/contexts/wallet/sheets/network_filter/view.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.common.sheets.network-filter.view +(ns status-im.contexts.wallet.sheets.network-filter.view (:require [quo.core :as quo] [reagent.core :as reagent] diff --git a/src/status_im/contexts/wallet/common/sheets/network_preferences/style.cljs b/src/status_im/contexts/wallet/sheets/network_preferences/style.cljs similarity index 80% rename from src/status_im/contexts/wallet/common/sheets/network_preferences/style.cljs rename to src/status_im/contexts/wallet/sheets/network_preferences/style.cljs index 8668afe5ba..1d40a1bd32 100644 --- a/src/status_im/contexts/wallet/common/sheets/network_preferences/style.cljs +++ b/src/status_im/contexts/wallet/sheets/network_preferences/style.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.common.sheets.network-preferences.style +(ns status-im.contexts.wallet.sheets.network-preferences.style (:require [quo.foundations.colors :as colors])) (def blur diff --git a/src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs b/src/status_im/contexts/wallet/sheets/network_preferences/view.cljs similarity index 97% rename from src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs rename to src/status_im/contexts/wallet/sheets/network_preferences/view.cljs index b1981d1614..4ba2e1b2cc 100644 --- a/src/status_im/contexts/wallet/common/sheets/network_preferences/view.cljs +++ b/src/status_im/contexts/wallet/sheets/network_preferences/view.cljs @@ -1,11 +1,11 @@ -(ns status-im.contexts.wallet.common.sheets.network-preferences.view +(ns status-im.contexts.wallet.sheets.network-preferences.view (:require [quo.core :as quo] [quo.foundations.colors :as colors] [quo.theme :as quo.theme] [react-native.blur :as blur] [reagent.core :as reagent] - [status-im.contexts.wallet.common.sheets.network-preferences.style :as style] [status-im.contexts.wallet.common.utils :as utils] + [status-im.contexts.wallet.sheets.network-preferences.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/common/sheets/remove_account/style.cljs b/src/status_im/contexts/wallet/sheets/remove_account/style.cljs similarity index 83% rename from src/status_im/contexts/wallet/common/sheets/remove_account/style.cljs rename to src/status_im/contexts/wallet/sheets/remove_account/style.cljs index b96fc919d3..e0b9930ebd 100644 --- a/src/status_im/contexts/wallet/common/sheets/remove_account/style.cljs +++ b/src/status_im/contexts/wallet/sheets/remove_account/style.cljs @@ -1,4 +1,4 @@ -(ns status-im.contexts.wallet.common.sheets.remove-account.style) +(ns status-im.contexts.wallet.sheets.remove-account.style) (def desc-container {:padding-horizontal 20 diff --git a/src/status_im/contexts/wallet/common/sheets/remove_account/view.cljs b/src/status_im/contexts/wallet/sheets/remove_account/view.cljs similarity index 96% rename from src/status_im/contexts/wallet/common/sheets/remove_account/view.cljs rename to src/status_im/contexts/wallet/sheets/remove_account/view.cljs index a9d086ce13..d504e65f89 100644 --- a/src/status_im/contexts/wallet/common/sheets/remove_account/view.cljs +++ b/src/status_im/contexts/wallet/sheets/remove_account/view.cljs @@ -1,12 +1,12 @@ -(ns status-im.contexts.wallet.common.sheets.remove-account.view +(ns status-im.contexts.wallet.sheets.remove-account.view (:require [quo.core :as quo] [quo.theme] [react-native.clipboard :as clipboard] [react-native.core :as rn] [reagent.core :as reagent] - [status-im.contexts.wallet.common.sheets.remove-account.style :as style] [status-im.contexts.wallet.common.utils :as utils] + [status-im.contexts.wallet.sheets.remove-account.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf])) diff --git a/src/status_im/contexts/wallet/sheets/select_account/style.cljs b/src/status_im/contexts/wallet/sheets/select_account/style.cljs new file mode 100644 index 0000000000..bca762dadd --- /dev/null +++ b/src/status_im/contexts/wallet/sheets/select_account/style.cljs @@ -0,0 +1,4 @@ +(ns status-im.contexts.wallet.sheets.select-account.style) + +(def list-container + {:margin-horizontal 8}) diff --git a/src/status_im/contexts/wallet/common/sheets/select_account/view.cljs b/src/status_im/contexts/wallet/sheets/select_account/view.cljs similarity index 90% rename from src/status_im/contexts/wallet/common/sheets/select_account/view.cljs rename to src/status_im/contexts/wallet/sheets/select_account/view.cljs index 70f467b6ff..230195d78f 100644 --- a/src/status_im/contexts/wallet/common/sheets/select_account/view.cljs +++ b/src/status_im/contexts/wallet/sheets/select_account/view.cljs @@ -1,8 +1,8 @@ -(ns status-im.contexts.wallet.common.sheets.select-account.view +(ns status-im.contexts.wallet.sheets.select-account.view (:require [quo.core :as quo] quo.theme [react-native.gesture :as gesture] - [status-im.contexts.wallet.common.sheets.select-account.style :as style] + [status-im.contexts.wallet.sheets.select-account.style :as style] [utils.i18n :as i18n] [utils.re-frame :as rf]))