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

chore(navigation): qualify wallet screen keywords (#18778)

This commit is contained in:
Jamie Caprani 2024-03-12 11:22:04 +00:00 committed by GitHub
parent 637efa24cf
commit 2931ae84ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 95 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/common/universal_links.cljs
View File

@ -98,7 +98,7 @@
[cofx {address :account}] [cofx {address :account}]
(when-let [account (existing-account? cofx address)] (when-let [account (existing-account? cofx address)]
(navigation/navigate-to cofx (navigation/navigate-to cofx
:wallet-account :screen/wallet.accounts
account))) account)))
(defn handle-not-found (defn handle-not-found

2
src/status_im/contexts/wallet/account/bridge/view.cljs
View File

@ -28,4 +28,4 @@
:on-token-press (fn [token] :on-token-press (fn [token]
(rf/dispatch [:wallet/bridge-select-token (rf/dispatch [:wallet/bridge-select-token
{:token token {:token token
:stack-id :wallet-bridge}]))}]]))) :stack-id :screen/wallet.bridge}]))}]])))

4
src/status_im/contexts/wallet/account/bridge_send/view.cljs
View File

@ -11,10 +11,10 @@
[] []
[rn/view {:style style/bridge-send-wrapper} [rn/view {:style style/bridge-send-wrapper}
[input-amount/view [input-amount/view
{:current-screen-id :wallet-bridge-send {:current-screen-id :screen/wallet.bridge-send
:button-one-label (i18n/label :t/confirm-bridge) :button-one-label (i18n/label :t/confirm-bridge)
:button-one-props {:icon-left :i/bridge} :button-one-props {:icon-left :i/bridge}
:on-navigate-back (fn [] :on-navigate-back (fn []
(rf/dispatch [:navigate-back-within-stack :wallet-bridge-send]))}]]) (rf/dispatch [:navigate-back-within-stack :screen/wallet.bridge-send]))}]])
(def view (quo.theme/with-theme view-internal)) (def view (quo.theme/with-theme view-internal))

4
src/status_im/contexts/wallet/account/bridge_to/view.cljs
View File

@ -3,7 +3,7 @@
[clojure.string :as string] [clojure.string :as string]
[quo.core :as quo] [quo.core :as quo]
[quo.foundations.resources :as quo.resources] [quo.foundations.resources :as quo.resources]
[quo.theme :as quo.theme] [quo.theme]
[react-native.core :as rn] [react-native.core :as rn]
[status-im.contexts.wallet.account.bridge-to.style :as style] [status-im.contexts.wallet.account.bridge-to.style :as style]
[status-im.contexts.wallet.common.account-switcher.view :as account-switcher] [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
@ -48,7 +48,7 @@
{:name (string/upper-case (str (:name token)))})] {:name (string/upper-case (str (:name token)))})]
[rn/view [rn/view
[account-switcher/view [account-switcher/view
{:on-press #(rf/dispatch [:navigate-back-within-stack :wallet-bridge-to]) {:on-press #(rf/dispatch [:navigate-back-within-stack :screen/wallet.bridge-to])
:icon-name :i/arrow-left :icon-name :i/arrow-left
:accessibility-label :top-bar}] :accessibility-label :top-bar}]
[quo/page-top {:title bridge-to-title}] [quo/page-top {:title bridge-to-title}]

2
src/status_im/contexts/wallet/account/tabs/about/view.cljs
View File

@ -52,7 +52,7 @@
{:icon :i/qr-code {:icon :i/qr-code
:accessibility-label :show-address-qr :accessibility-label :show-address-qr
:label (i18n/label :t/show-address-qr) :label (i18n/label :t/show-address-qr)
:on-press #(rf/dispatch [:open-modal :wallet-share-address {:status :share}])} :on-press #(rf/dispatch [:open-modal :screen/wallet.share-address {:status :share}])}
{:icon :i/share {:icon :i/share
:accessibility-label :share-address :accessibility-label :share-address
:label (i18n/label :t/share-address) :label (i18n/label :t/share-address)

4
src/status_im/contexts/wallet/account/view.cljs
View File

@ -51,8 +51,8 @@
[quo/wallet-ctas [quo/wallet-ctas
{:send-action (fn [] {:send-action (fn []
(rf/dispatch [:wallet/clean-send-data]) (rf/dispatch [:wallet/clean-send-data])
(rf/dispatch [:open-modal :wallet-select-address])) (rf/dispatch [:open-modal :screen/wallet.select-address]))
:receive-action #(rf/dispatch [:open-modal :wallet-share-address {:status :receive}]) :receive-action #(rf/dispatch [:open-modal :screen/wallet.share-address {:status :receive}])
:buy-action #(rf/dispatch [:show-bottom-sheet :buy-action #(rf/dispatch [:show-bottom-sheet
{:content buy-drawer}]) {:content buy-drawer}])
:bridge-action #(ff/alert ::ff/wallet.bridge-token :bridge-action #(ff/alert ::ff/wallet.bridge-token

4
src/status_im/contexts/wallet/add_address_to_watch/view.cljs
View File

@ -65,7 +65,7 @@
{:type :outline {:type :outline
:on-press (fn [] :on-press (fn []
(rn/dismiss-keyboard!) (rn/dismiss-keyboard!)
(rf/dispatch [:open-modal :scan-address])) (rf/dispatch [:open-modal :screen/wallet.scan-address]))
:container-style style/scan :container-style style/scan
:size 40 :size 40
:icon-only? true} :icon-only? true}
@ -137,7 +137,7 @@
(not validated-address)) (not validated-address))
:on-press (fn [] :on-press (fn []
(rf/dispatch [:navigate-to (rf/dispatch [:navigate-to
:confirm-address-to-watch :screen/wallet.confirm-address-to-watch
{:address validated-address}]) {:address validated-address}])
(clear-input)) (clear-input))
:container-style {:z-index 2}} :container-style {:z-index 2}}

2
src/status_im/contexts/wallet/common/token_value/view.cljs
View File

@ -20,7 +20,7 @@
(rf/dispatch [:hide-bottom-sheet]) (rf/dispatch [:hide-bottom-sheet])
(rf/dispatch [:wallet/clean-send-data]) (rf/dispatch [:wallet/clean-send-data])
(rf/dispatch [:wallet/send-select-token-drawer {:token token-data}]) (rf/dispatch [:wallet/send-select-token-drawer {:token token-data}])
(rf/dispatch [:open-modal :wallet-select-address]))} (rf/dispatch [:open-modal :screen/wallet.select-address]))}
{:icon :i/receive {:icon :i/receive
:accessibility-label :receive :accessibility-label :receive
:label (i18n/label :t/receive) :label (i18n/label :t/receive)

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

@ -80,7 +80,7 @@
(reset! show-error? false) (reset! show-error? false)
(when (= @quiz-index questions-count) (when (= @quiz-index questions-count)
(rf/dispatch [:navigate-to (rf/dispatch [:navigate-to
:wallet-keypair-name]))) :screen/wallet.keypair-name])))
(do (do
(when (> @incorrect-count 0) (when (> @incorrect-count 0)
(rf/dispatch [:show-bottom-sheet (rf/dispatch [:show-bottom-sheet

2
src/status_im/contexts/wallet/create_account/select_keypair/view.cljs
View File

@ -16,7 +16,7 @@
[[{:icon :i/add [[{:icon :i/add
:accessibility-label :generate-new-keypair :accessibility-label :generate-new-keypair
:label (i18n/label :t/generate-new-keypair) :label (i18n/label :t/generate-new-keypair)
:on-press #(rf/dispatch [:navigate-to :wallet-backup-recovery-phrase])} :on-press #(rf/dispatch [:navigate-to :screen/wallet.backup-recovery-phrase])}
{:icon :i/seed {:icon :i/seed
:accessibility-label :import-using-phrase :accessibility-label :import-using-phrase
:label (i18n/label :t/import-using-phrase) :label (i18n/label :t/import-using-phrase)

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

@ -32,7 +32,7 @@
:customization-color account-color}) :customization-color account-color})
:action (when-not keypair-name :button) :action (when-not keypair-name :button)
:action-props {:on-press (fn [] :action-props {:on-press (fn []
(rf/dispatch [:navigate-to :wallet-select-keypair])) (rf/dispatch [:navigate-to :scrren/wallet.select-keypair]))
:button-text (i18n/label :t/edit) :button-text (i18n/label :t/edit)
:alignment :flex-start} :alignment :flex-start}
:description :text :description :text

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

@ -30,13 +30,13 @@
(rf/reg-event-fx :wallet/navigate-to-account (rf/reg-event-fx :wallet/navigate-to-account
(fn [{:keys [db]} [address]] (fn [{:keys [db]} [address]]
{:db (assoc-in db [:wallet :current-viewing-account-address] address) {:db (assoc-in db [:wallet :current-viewing-account-address] address)
:fx [[:dispatch [:navigate-to :wallet-accounts address]]]})) :fx [[:dispatch [:navigate-to :screen/wallet.accounts address]]]}))
(rf/reg-event-fx :wallet/navigate-to-new-account (rf/reg-event-fx :wallet/navigate-to-new-account
(fn [{:keys [db]} [address]] (fn [{:keys [db]} [address]]
{:db (assoc-in db [:wallet :current-viewing-account-address] address) {:db (assoc-in db [:wallet :current-viewing-account-address] address)
:fx [[:dispatch [:hide-bottom-sheet]] :fx [[:dispatch [:hide-bottom-sheet]]
[:dispatch [:navigate-to :wallet-accounts address]] [:dispatch [:navigate-to :screen/wallet.accounts address]]
[:dispatch [:wallet/show-account-created-toast address]]]})) [:dispatch [:wallet/show-account-created-toast address]]]}))
(rf/reg-event-fx :wallet/switch-current-viewing-account (rf/reg-event-fx :wallet/switch-current-viewing-account
@ -240,17 +240,17 @@
{:db (-> db {:db (-> db
(assoc-in [:wallet :ui :send :token] token) (assoc-in [:wallet :ui :send :token] token)
(assoc-in [:wallet :ui :send :to-address] to-address)) (assoc-in [:wallet :ui :send :to-address] to-address))
:fx [[:dispatch [:navigate-to-within-stack [:wallet-bridge-to stack-id]]]]}))) :fx [[:dispatch [:navigate-to-within-stack [:screen/wallet.bridge-to stack-id]]]]})))
(rf/reg-event-fx :wallet/start-bridge (rf/reg-event-fx :wallet/start-bridge
(fn [{:keys [db]}] (fn [{:keys [db]}]
{:db (assoc-in db [:wallet :ui :send :type] :bridge) {:db (assoc-in db [:wallet :ui :send :type] :bridge)
:fx [[:dispatch [:open-modal :wallet-bridge]]]})) :fx [[:dispatch [:open-modal :screen/wallet.bridge]]]}))
(rf/reg-event-fx :wallet/select-bridge-network (rf/reg-event-fx :wallet/select-bridge-network
(fn [{:keys [db]} [{:keys [network-chain-id stack-id]}]] (fn [{:keys [db]} [{:keys [network-chain-id stack-id]}]]
{:db (assoc-in db [:wallet :ui :send :bridge-to-chain-id] network-chain-id) {:db (assoc-in db [:wallet :ui :send :bridge-to-chain-id] network-chain-id)
:fx [[:dispatch [:navigate-to-within-stack [:wallet-bridge-send stack-id]]]]})) :fx [[:dispatch [:navigate-to-within-stack [:screen/wallet.bridge-send stack-id]]]]}))
(rf/reg-event-fx (rf/reg-event-fx
:wallet/get-ethereum-chains :wallet/get-ethereum-chains
@ -410,7 +410,7 @@
{:db (-> db {:db (-> db
(assoc-in [:wallet :ui :create-account :secret-phrase] secret-phrase) (assoc-in [:wallet :ui :create-account :secret-phrase] secret-phrase)
(assoc-in [:wallet :ui :create-account :random-phrase] random-phrase)) (assoc-in [:wallet :ui :create-account :random-phrase] random-phrase))
:fx [[:dispatch-later [{:ms 20 :dispatch [:navigate-to :wallet-check-your-backup]}]]]}) :fx [[:dispatch-later [{:ms 20 :dispatch [:navigate-to :screens/wallet.check-your-backup]}]]]})
(rf/reg-event-fx :wallet/store-secret-phrase store-secret-phrase) (rf/reg-event-fx :wallet/store-secret-phrase store-secret-phrase)

2
src/status_im/contexts/wallet/events/collectibles.cljs
View File

@ -45,7 +45,7 @@
(defn store-last-collectible-details (defn store-last-collectible-details
[{:keys [db]} [collectible]] [{:keys [db]} [collectible]]
{:db (assoc-in db [:wallet :last-collectible-details] collectible) {:db (assoc-in db [:wallet :last-collectible-details] collectible)
:dispatch [:navigate-to :wallet-collectible]}) :dispatch [:navigate-to :screen/wallet.collectible]})
(rf/reg-event-fx :wallet/store-last-collectible-details store-last-collectible-details) (rf/reg-event-fx :wallet/store-last-collectible-details store-last-collectible-details)

4
src/status_im/contexts/wallet/home/view.cljs
View File

@ -18,12 +18,12 @@
:accessibility-label :start-a-new-chat :accessibility-label :start-a-new-chat
:label (i18n/label :t/add-account) :label (i18n/label :t/add-account)
:sub-label (i18n/label :t/add-account-description) :sub-label (i18n/label :t/add-account-description)
:on-press #(rf/dispatch [:navigate-to :wallet-create-account])} :on-press #(rf/dispatch [:navigate-to :screen/wallet.create-account])}
{:icon :i/reveal {:icon :i/reveal
:accessibility-label :add-a-contact :accessibility-label :add-a-contact
:label (i18n/label :t/add-address) :label (i18n/label :t/add-address)
:sub-label (i18n/label :t/add-address-description) :sub-label (i18n/label :t/add-address-description)
:on-press #(rf/dispatch [:navigate-to :add-address-to-watch]) :on-press #(rf/dispatch [:navigate-to :screen/wallet.add-address-to-watch])
:add-divider? true}]]]) :add-divider? true}]]])
(defn- new-account-card-data (defn- new-account-card-data

14
src/status_im/contexts/wallet/send/events.cljs
View File

@ -67,8 +67,8 @@
:fx [[:dispatch :fx [[:dispatch
[:navigate-to-within-stack [:navigate-to-within-stack
(if token? (if token?
[:wallet-send-input-amount stack-id] [:screen/wallet.send-input-amount stack-id]
[:wallet-select-asset stack-id])]]]}))) [:screen/wallet.select-asset stack-id])]]]})))
(rf/reg-event-fx (rf/reg-event-fx
:wallet/update-receiver-networks :wallet/update-receiver-networks
@ -81,7 +81,7 @@
(update-in [:wallet :ui :send] dissoc :collectible) (update-in [:wallet :ui :send] dissoc :collectible)
(assoc-in [:wallet :ui :send :token] token)) (assoc-in [:wallet :ui :send :token] token))
:fx [[:dispatch [:wallet/clean-suggested-routes]] :fx [[:dispatch [:wallet/clean-suggested-routes]]
[:dispatch [:navigate-to-within-stack [:wallet-send-input-amount stack-id]]]]})) [:dispatch [:navigate-to-within-stack [:screen/wallet.send-input-amount stack-id]]]]}))
(rf/reg-event-fx (rf/reg-event-fx
:wallet/send-select-token-drawer :wallet/send-select-token-drawer
@ -110,12 +110,12 @@
(assoc-in [:wallet :ui :send :type] :collectible) (assoc-in [:wallet :ui :send :type] :collectible)
(assoc-in [:wallet :ui :send :amount] 1)) (assoc-in [:wallet :ui :send :amount] 1))
:fx [[:dispatch [:wallet/get-suggested-routes {:amount 1}]] :fx [[:dispatch [:wallet/get-suggested-routes {:amount 1}]]
[:navigate-to-within-stack [:wallet-transaction-confirmation stack-id]]]})) [:navigate-to-within-stack [:screen/wallet.transaction-confirmation stack-id]]]}))
(rf/reg-event-fx :wallet/send-select-amount (rf/reg-event-fx :wallet/send-select-amount
(fn [{:keys [db]} [{:keys [amount stack-id]}]] (fn [{:keys [db]} [{:keys [amount stack-id]}]]
{:db (assoc-in db [:wallet :ui :send :amount] amount) {:db (assoc-in db [:wallet :ui :send :amount] amount)
:fx [[:dispatch [:navigate-to-within-stack [:wallet-transaction-confirmation stack-id]]]]})) :fx [[:dispatch [:navigate-to-within-stack [:screen/wallet.transaction-confirmation stack-id]]]]}))
(rf/reg-event-fx :wallet/get-suggested-routes (rf/reg-event-fx :wallet/get-suggested-routes
(fn [{:keys [db now]} [{:keys [amount]}]] (fn [{:keys [db now]} [{:keys [amount]}]]
@ -185,11 +185,11 @@
(assoc-in [:wallet :ui :send :transaction-ids] transaction-ids)) (assoc-in [:wallet :ui :send :transaction-ids] transaction-ids))
:fx [[:dispatch :fx [[:dispatch
[:navigate-to-within-stack [:navigate-to-within-stack
[:wallet-transaction-progress :wallet-transaction-confirmation]]]]}))) [:screen/wallet.transaction-progress :screen/wallet.transaction-confirmation]]]]})))
(rf/reg-event-fx :wallet/close-transaction-progress-page (rf/reg-event-fx :wallet/close-transaction-progress-page
(fn [_] (fn [_]
{:fx [[:dispatch [:dismiss-modal :wallet-transaction-progress]]]})) {:fx [[:dispatch [:dismiss-modal :screen/wallet.transaction-progress]]]}))
(defn- transaction-bridge (defn- transaction-bridge
[{:keys [from-address from-chain-id to-address token-id token-address route data eth-transfer?]}] [{:keys [from-address from-chain-id to-address token-id token-address route data eth-transfer?]}]

2
src/status_im/contexts/wallet/send/input_amount/component_spec.cljs
View File

@ -53,7 +53,7 @@
:eip1559-enabled true}}] :eip1559-enabled true}}]
:wallet/wallet-send-suggested-routes {:candidates []} :wallet/wallet-send-suggested-routes {:candidates []}
:wallet/wallet-send-selected-networks [] :wallet/wallet-send-selected-networks []
:navigation/current-screen-id :wallet-send-input-amount :navigation/current-screen-id :screen/wallet.send-input-amount
:wallet/wallet-send-to-address "0x04371e2d9d66b82f056bc128064" :wallet/wallet-send-to-address "0x04371e2d9d66b82f056bc128064"
:profile/currency-symbol "$" :profile/currency-symbol "$"
:wallet/token-by-symbol {:symbol :eth :wallet/token-by-symbol {:symbol :eth

2
src/status_im/contexts/wallet/send/select_address/tabs/view.cljs
View File

@ -16,7 +16,7 @@
{:address address {:address address
:token? false :token? false
:recipient account :recipient account
:stack-id :wallet-select-address}])}]) :stack-id :screen/wallet.select-address}])}])
(defn my-accounts (defn my-accounts
[theme] [theme]

23
src/status_im/contexts/wallet/send/select_address/view.cljs
View File

@ -38,12 +38,12 @@
:on-scan (fn [] :on-scan (fn []
(rn/dismiss-keyboard!) (rn/dismiss-keyboard!)
(rf/dispatch [:wallet/clean-scanned-address]) (rf/dispatch [:wallet/clean-scanned-address])
(rf/dispatch [:open-modal :scan-address])) (rf/dispatch [:open-modal :screen/wallet.scan-address]))
:ens-regex constants/regx-ens :ens-regex constants/regx-ens
:scanned-value (or (when recipient-plain-address? send-address) scanned-address) :scanned-value (or (when recipient-plain-address? send-address) scanned-address)
:address-regex constants/regx-multichain-address :address-regex constants/regx-multichain-address
:on-detect-address #(when (or (= current-screen-id :wallet-select-address) :on-detect-address #(when (or (= current-screen-id :screen/wallet.select-address)
(= current-screen-id :scan-address)) (= current-screen-id :screen/wallet.scan-address))
; ^ this check is to prevent effect being triggered when screen is ; ^ this check is to prevent effect being triggered when screen is
; loaded but not being shown to the user (deep in the navigation ; loaded but not being shown to the user (deep in the navigation
; stack) and avoid undesired behaviors ; stack) and avoid undesired behaviors
@ -51,8 +51,8 @@
[:wallet/validate-address %] [:wallet/validate-address %]
300)) 300))
:on-detect-ens (fn [text cb] :on-detect-ens (fn [text cb]
(when (or (= current-screen-id :wallet-select-address) (when (or (= current-screen-id :screen/wallet.select-address)
(= current-screen-id :scan-address)) (= current-screen-id :screen/wallet.scan-address))
; ^ this check is to prevent effect being triggered when screen ; ^ this check is to prevent effect being triggered when screen
; is loaded but not being shown to the user (deep in the ; is loaded but not being shown to the user (deep in the
; navigation stack) and avoid undesired behaviors ; navigation stack) and avoid undesired behaviors
@ -95,7 +95,7 @@
{:address address {:address address
:token? false :token? false
:recipient local-suggestion :recipient local-suggestion
:stack-id :wallet-select-address}])))) :stack-id :screen/wallet.select-address}]))))
:active-state? false}] :active-state? false}]
(cond (cond
(= type types/saved-address) (= type types/saved-address)
@ -154,11 +154,12 @@
{:accessibility-label :continue-button {:accessibility-label :continue-button
:type :primary :type :primary
:disabled? (not valid-ens-or-address?) :disabled? (not valid-ens-or-address?)
:on-press #(rf/dispatch [:wallet/select-send-address :on-press #(rf/dispatch
{:address @input-value [:wallet/select-send-address
:token? (some? token) {:address @input-value
:stack-id :token? (some? token)
:wallet-select-address}]) :stack-id
:screen/wallet.select-address}])
:customization-color color} :customization-color color}
(i18n/label :t/continue)])} (i18n/label :t/continue)])}
[quo/page-top [quo/page-top

6
src/status_im/contexts/wallet/send/select_asset/view.cljs
View File

@ -36,7 +36,7 @@
:on-end-reached #(rf/dispatch [:wallet/request-collectibles-for-current-viewing-account]) :on-end-reached #(rf/dispatch [:wallet/request-collectibles-for-current-viewing-account])
:on-collectible-press #(rf/dispatch [:wallet/send-select-collectible :on-collectible-press #(rf/dispatch [:wallet/send-select-collectible
{:collectible % {:collectible %
:stack-id :wallet-select-asset}])}])) :stack-id :screen/wallet.select-asset}])}]))
(defn- tab-view (defn- tab-view
[search-text selected-tab on-change-text] [search-text selected-tab on-change-text]
(let [unfiltered-collectibles (rf/sub [:wallet/current-viewing-account-collectibles]) (let [unfiltered-collectibles (rf/sub [:wallet/current-viewing-account-collectibles])
@ -46,7 +46,7 @@
on-token-press (fn [token] on-token-press (fn [token]
(rf/dispatch [:wallet/send-select-token (rf/dispatch [:wallet/send-select-token
{:token token {:token token
:stack-id :wallet-select-asset}]))] :stack-id :screen/wallet.select-asset}]))]
[:<> [:<>
(when show-search-input? (when show-search-input?
[search-input search-text on-change-text]) [search-input search-text on-change-text])
@ -63,7 +63,7 @@
search-text (reagent/atom "") search-text (reagent/atom "")
on-change-text #(reset! search-text %) on-change-text #(reset! search-text %)
on-change-tab #(reset! selected-tab %) on-change-tab #(reset! selected-tab %)
on-close #(rf/dispatch [:navigate-back-within-stack :wallet-select-asset])] on-close #(rf/dispatch [:navigate-back-within-stack :screen/wallet.select-asset])]
(fn [] (fn []
[rn/safe-area-view {:style style/container} [rn/safe-area-view {:style style/container}
[account-switcher/view [account-switcher/view

4
src/status_im/contexts/wallet/send/send_amount/view.cljs
View File

@ -8,11 +8,11 @@
(defn- view-internal (defn- view-internal
[] []
[input-amount/view [input-amount/view
{:current-screen-id :wallet-send-input-amount {:current-screen-id :screen/wallet.send-input-amount
:button-one-label (i18n/label :t/confirm) :button-one-label (i18n/label :t/confirm)
:on-navigate-back (fn [] :on-navigate-back (fn []
(rf/dispatch [:wallet/clean-selected-token]) (rf/dispatch [:wallet/clean-selected-token])
(rf/dispatch [:wallet/clean-selected-collectible]) (rf/dispatch [:wallet/clean-selected-collectible])
(rf/dispatch [:navigate-back-within-stack :wallet-send-input-amount]))}]) (rf/dispatch [:navigate-back-within-stack :screen/wallet.send-input-amount]))}])
(def view (quo.theme/with-theme view-internal)) (def view (quo.theme/with-theme view-internal))

2
src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs
View File

@ -238,7 +238,7 @@
(defn- view-internal (defn- view-internal
[_] [_]
(let [on-close (fn [] (let [on-close (fn []
(rf/dispatch [:navigate-back-within-stack :wallet-transaction-confirmation]) (rf/dispatch [:navigate-back-within-stack :screen/wallet.transaction-confirmation])
(rf/dispatch [:wallet/clean-suggested-routes]) (rf/dispatch [:wallet/clean-suggested-routes])
(rf/dispatch [:wallet/clean-selected-collectible]))] (rf/dispatch [:wallet/clean-selected-collectible]))]
(fn [{:keys [theme]}] (fn [{:keys [theme]}]

4
src/status_im/contexts/wallet/sheets/account_options/view.cljs
View File

@ -71,7 +71,7 @@
[[{:icon :i/edit [[{:icon :i/edit
:accessibility-label :edit :accessibility-label :edit
:label (i18n/label :t/edit-account) :label (i18n/label :t/edit-account)
:on-press #(rf/dispatch [:navigate-to :wallet-edit-account])} :on-press #(rf/dispatch [:navigate-to :screen/wallet.edit-account])}
{:icon :i/copy {:icon :i/copy
:accessibility-label :copy-address :accessibility-label :copy-address
:label (i18n/label :t/copy-address) :label (i18n/label :t/copy-address)
@ -83,7 +83,7 @@
{:icon :i/qr-code {:icon :i/qr-code
:accessibility-label :show-address-qr :accessibility-label :show-address-qr
:label (i18n/label :t/show-address-qr) :label (i18n/label :t/show-address-qr)
:on-press #(rf/dispatch [:open-modal :wallet-share-address {:status :share}])} :on-press #(rf/dispatch [:open-modal :screen/wallet.share-address {:status :share}])}
{:icon :i/share {:icon :i/share
:accessibility-label :share-account :accessibility-label :share-account
:label (i18n/label :t/share-address) :label (i18n/label :t/share-address)

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

@ -52,12 +52,13 @@
[status-im.contexts.syncing.scan-sync-code-page.view :as scan-sync-code-page] [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.setup-syncing.view :as settings-setup-syncing]
[status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing] [status-im.contexts.syncing.syncing-devices-list.view :as settings-syncing]
[status-im.contexts.wallet.account.bridge-send.view :as bridge-send] [status-im.contexts.wallet.account.bridge-send.view :as wallet-bridge-send]
[status-im.contexts.wallet.account.bridge-to.view :as bridge-to] [status-im.contexts.wallet.account.bridge-to.view :as wallet-bridge-to]
[status-im.contexts.wallet.account.bridge.view :as bridge] [status-im.contexts.wallet.account.bridge.view :as wallet-bridge]
[status-im.contexts.wallet.account.view :as wallet-accounts] [status-im.contexts.wallet.account.view :as wallet-accounts]
[status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as confirm-address-to-watch] [status-im.contexts.wallet.add-address-to-watch.confirm-address.view :as
[status-im.contexts.wallet.add-address-to-watch.view :as add-address-to-watch] wallet-confirm-address-to-watch]
[status-im.contexts.wallet.add-address-to-watch.view :as wallet-add-address-to-watch]
[status-im.contexts.wallet.collectible.view :as wallet-collectible] [status-im.contexts.wallet.collectible.view :as wallet-collectible]
[status-im.contexts.wallet.create-account.edit-derivation-path.view :as wallet-edit-derivation-path] [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 [status-im.contexts.wallet.create-account.new-keypair.backup-recovery-phrase.view :as
@ -69,7 +70,7 @@
[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]
[status-im.contexts.wallet.saved-addresses.view :as wallet-saved-addresses] [status-im.contexts.wallet.saved-addresses.view :as wallet-saved-addresses]
[status-im.contexts.wallet.scan-account.view :as scan-address] [status-im.contexts.wallet.scan-account.view :as wallet-scan-address]
[status-im.contexts.wallet.send.select-address.view :as wallet-select-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] [status-im.contexts.wallet.send.select-asset.view :as wallet-select-asset]
[status-im.contexts.wallet.send.send-amount.view :as wallet-send-input-amount] [status-im.contexts.wallet.send.send-amount.view :as wallet-send-input-amount]
@ -327,95 +328,95 @@
:options {:sheet? true} :options {:sheet? true}
:component emoji-picker/view} :component emoji-picker/view}
{:name :wallet-accounts {:name :screen/wallet.accounts
:options {:insets {:top? true} :options {:insets {:top? true}
:popGesture false :popGesture false
:hardwareBackButton {:dismissModalOnPress false :hardwareBackButton {:dismissModalOnPress false
:popStackOnPress false}} :popStackOnPress false}}
:component wallet-accounts/view} :component wallet-accounts/view}
{:name :wallet-edit-account {:name :screen/wallet.edit-account
:component wallet-edit-account/view} :component wallet-edit-account/view}
{:name :add-address-to-watch {:name :screen/wallet.add-address-to-watch
:options {:insets {:top? true}} :options {:insets {:top? true}}
:component add-address-to-watch/view} :component wallet-add-address-to-watch/view}
{:name :confirm-address-to-watch {:name :screen/wallet.confirm-address-to-watch
:component confirm-address-to-watch/view} :component wallet-confirm-address-to-watch/view}
{:name :wallet-bridge {:name :screen/wallet.bridge
:options {:insets {:top? true} :options {:insets {:top? true}
:modalPresentationStyle :overCurrentContext} :modalPresentationStyle :overCurrentContext}
:component bridge/view} :component wallet-bridge/view}
{:name :wallet-bridge-to {:name :screen/wallet.bridge-to
:options {:insets {:top? true}} :options {:insets {:top? true}}
:component bridge-to/view} :component wallet-bridge-to/view}
{:name :wallet-bridge-send {:name :screen/wallet.bridge-send
:options {:insets {:top? true}} :options {:insets {:top? true}}
:component bridge-send/view} :component wallet-bridge-send/view}
{:name :wallet-edit-derivation-path {:name :screen/wallet.edit-derivation-path
:component wallet-edit-derivation-path/view} :component wallet-edit-derivation-path/view}
{:name :wallet-collectible {:name :screen/wallet.collectible
:component wallet-collectible/view} :component wallet-collectible/view}
{:name :wallet-select-keypair {:name :screen/wallet.select-keypair
:options {:insets {:top? true :bottom? true}} :options {:insets {:top? true :bottom? true}}
:component wallet-select-keypair/view} :component wallet-select-keypair/view}
{:name :wallet-create-account {:name :screen/wallet.create-account
:options {:insets {:top? true}} :options {:insets {:top? true}}
:component wallet-create-account/view} :component wallet-create-account/view}
{:name :wallet-backup-recovery-phrase {:name :screen/wallet.backup-recovery-phrase
:options {:insets {:top? true :bottom? true}} :options {:insets {:top? true :bottom? true}}
:component wallet-backup-recovery-phrase/view} :component wallet-backup-recovery-phrase/view}
{:name :wallet-check-your-backup {:name :screen/wallet.check-your-backup
: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 {:name :screen/wallet.keypair-name
:options {:insets {:top? true :bottom? true}} :options {:insets {:top? true :bottom? true}}
:component wallet-keypair-name/view} :component wallet-keypair-name/view}
{:name :wallet-share-address {:name :screen/wallet.share-address
:options options/transparent-screen-options :options options/transparent-screen-options
:component wallet-share-address/view} :component wallet-share-address/view}
{:name :wallet-saved-addresses {:name :screen/wallet.saved-addresses
:component wallet-saved-addresses/view} :component wallet-saved-addresses/view}
{:name :wallet-send-input-amount {:name :screen/wallet.send-input-amount
:options {:modalPresentationStyle :overCurrentContext :options {:modalPresentationStyle :overCurrentContext
:insets {:top? true :insets {:top? true
:bottom? true}} :bottom? true}}
:component wallet-send-input-amount/view} :component wallet-send-input-amount/view}
{:name :wallet-select-address {:name :screen/wallet.select-address
:options {:modalPresentationStyle :overCurrentContext :options {:modalPresentationStyle :overCurrentContext
:insets {:top? true}} :insets {:top? true}}
:component wallet-select-address/view} :component wallet-select-address/view}
{:name :wallet-select-asset {:name :screen/wallet.select-asset
:options {:insets {:top? true}} :options {:insets {:top? true}}
:component wallet-select-asset/view} :component wallet-select-asset/view}
{:name :wallet-transaction-confirmation {:name :screen/wallet.transaction-confirmation
:component wallet-transaction-confirmation/view} :component wallet-transaction-confirmation/view}
{:name :wallet-transaction-progress {:name :screen/wallet.transaction-progress
:component wallet-transaction-progress/view} :component wallet-transaction-progress/view}
{:name :scan-address {:name :screen/wallet.scan-address
:options (merge :options (merge
options/dark-screen options/dark-screen
{:modalPresentationStyle :overCurrentContext}) {:modalPresentationStyle :overCurrentContext})
:component scan-address/view} :component wallet-scan-address/view}
{:name :scan-profile-qr-code {:name :scan-profile-qr-code
:options (merge :options (merge

8
src/status_im/navigation/view.cljs
View File

@ -56,12 +56,18 @@
(defn screen (defn screen
[screen-key] [screen-key]
(reagent.core/reactify-component (reagent.core/reactify-component
(fn [] (fn []
(let [{:keys [component options]} (get (if js/goog.DEBUG (let [screen-details (get (if js/goog.DEBUG
(get-screens) (get-screens)
screens) screens)
(keyword screen-key)) (keyword screen-key))
qualified-screen-details (get (if js/goog.DEBUG
(get-screens)
screens)
(keyword "screen" screen-key))
{:keys [component options]} (or qualified-screen-details screen-details)
{:keys [insets sheet? theme]} options {:keys [insets sheet? theme]} options
user-theme (theme/get-theme) user-theme (theme/get-theme)
alert-banners-top-margin (rf/sub [:alert-banners/top-margin]) alert-banners-top-margin (rf/sub [:alert-banners/top-margin])