Skip to content

Commit

Permalink
feat: elevate and highlight wallet CTAs on wallet home screen
Browse files Browse the repository at this point in the history 
Signed-off-by: Brian Sztamfater <brian@status.im>
  • Loading branch information
@briansztamfater
briansztamfater committed Jan 24, 2025
1 parent 4dfd616 commit ca748e5
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 51 deletions.
37 changes: 21 additions & 16 deletions src/status_im/contexts/shell/share/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[utils.re-frame :as rf]))

(defn- header
[]
[status]
[:<>
[rn/view {:style style/header-row}
[quo/button
Expand All @@ -36,31 +36,36 @@
{:size :heading-1
:weight :semi-bold
:style style/header-heading}
(i18n/label :t/share)]])
(if (= :receive status)
(i18n/label :t/receive)
(i18n/label :t/share))]])

(defn- tab-content
[initial-tab]
[initial-tab status hide-tab-selector?]
(let [[selected-tab set-selected-tab] (rn/use-state initial-tab)]
[rn/view {:style {:padding-top (safe-area/get-top)}}
[header]
[rn/view {:style style/tabs-container}
[quo/segmented-control
{:size 28
:blur? true
:on-change set-selected-tab
:default-active selected-tab
:data [{:id :profile
:label (i18n/label :t/profile)}
{:id :wallet
:label (i18n/label :t/wallet)}]}]]
[header status]
(when-not hide-tab-selector?
[rn/view {:style style/tabs-container}
[quo/segmented-control
{:size 28
:blur? true
:on-change set-selected-tab
:default-active selected-tab
:data [{:id :profile
:label (i18n/label :t/profile)}
{:id :wallet
:label (i18n/label :t/wallet)}]}]])
(if (= selected-tab :wallet)
[wallet-view/wallet-tab]
[profile-view/profile-tab])]))

(defn view
[]
(let [{:keys [initial-tab] :or {initial-tab :profile}} (rf/sub [:get-screen-params])]
(let [{:keys [initial-tab status hide-tab-selector?] :or {initial-tab :profile}}
(rf/sub
[:get-screen-params])]
[quo/overlay {:type :shell}
[rn/view
{:key :share}
[tab-content initial-tab]]]))
[tab-content initial-tab status hide-tab-selector?]]]))
2 changes: 1 addition & 1 deletion src/status_im/contexts/wallet/account/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{:content buy-token/view}])
:bridge-action (fn []
(rf/dispatch [:wallet/clean-send-data])
(rf/dispatch [:wallet/start-bridge]))
(rf/dispatch [:wallet/start-bridge {:navigate-forward? true}]))
:swap-action (fn []
(rf/dispatch [:wallet.tokens/get-token-list])
(rf/dispatch [:open-modal :screen/wallet.swap-select-asset-to-pay]))
Expand Down
16 changes: 9 additions & 7 deletions src/status_im/contexts/wallet/events.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,15 @@
[:wallet/bridge-select-token
(assoc params :network network)]))}])}]]])})))

(rf/reg-event-fx :wallet/start-bridge
(fn [{:keys [db]}]
{:db (assoc-in db [:wallet :ui :send :tx-type] :tx/bridge)
:fx [[:dispatch
[:wallet/wizard-navigate-forward
{:start-flow? true
:flow-id :wallet-bridge-flow}]]]}))
(rf/reg-event-fx
:wallet/start-bridge
(fn [{:keys [db]} [{:keys [navigate-forward?]}]]
(cond-> {:db (assoc-in db [:wallet :ui :send :tx-type] :tx/bridge)}
navigate-forward? (assoc :fx
[[:dispatch
[:wallet/wizard-navigate-forward
{:start-flow? true
:flow-id :wallet-bridge-flow}]]]))))

(rf/reg-event-fx :wallet/select-bridge-network
(fn [{:keys [db]} [{:keys [network-chain-id stack-id]}]]
Expand Down
5 changes: 5 additions & 0 deletions src/status_im/contexts/wallet/home/style.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,8 @@
(defn header-container
[theme]
{:background-color (colors/theme-colors colors/white colors/neutral-95 theme)})

(def cta-buttons
{:padding-horizontal 20
:padding-bottom 13
:flex-direction :row})
54 changes: 54 additions & 0 deletions src/status_im/contexts/wallet/home/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[status-im.common.refreshable-flat-list.view :as refreshable-flat-list]
[status-im.contexts.wallet.home.style :as style]
[status-im.contexts.wallet.home.tabs.view :as tabs]
[status-im.contexts.wallet.sheets.buy-token.view :as buy-token]
[status-im.contexts.wallet.sheets.network-filter.view :as network-filter]
[status-im.feature-flags :as ff]
[utils.i18n :as i18n]
Expand Down Expand Up @@ -71,9 +72,53 @@
tokens-loading? (rf/sub [:wallet/home-tokens-loading?])
networks (rf/sub [:wallet/selected-network-details])
account-cards-data (rf/sub [:wallet/account-cards-data])
testnet-mode? (rf/sub [:profile/test-networks-enabled?])
cards (conj account-cards-data (new-account-card-data))
[init-loaded? set-init-loaded] (rn/use-state false)
{:keys [formatted-balance]} (rf/sub [:wallet/aggregated-token-values-and-balance])
multiple-accounts? (> (count account-cards-data) 1)
first-account-address (:address (first account-cards-data))
on-send-press (rn/use-callback
(fn []
(rf/dispatch [:wallet/clean-send-data])
(when-not multiple-accounts?
(rf/dispatch [:wallet/switch-current-viewing-account
first-account-address]))
(if multiple-accounts?
(rf/dispatch [:open-modal :screen/wallet.select-from])
(rf/dispatch [:wallet/wizard-navigate-forward
{:start-flow? true
:flow-id :wallet-send-flow}])))
[multiple-accounts? first-account-address])
on-receive-press (rn/use-callback #(rf/dispatch [:open-modal :screen/share-shell
{:initial-tab :wallet
:status :receive
:hide-tab-selector? true}]))
on-buy-press (rn/use-callback #(rf/dispatch [:show-bottom-sheet
{:content buy-token/view}]))
on-bridge-press (rn/use-callback
(fn []
(rf/dispatch [:wallet/clean-send-data])
(when-not multiple-accounts?
(rf/dispatch [:wallet/switch-current-viewing-account
first-account-address]))
(rf/dispatch [:wallet/start-bridge
{:navigate-forward? (not multiple-accounts?)}])
(when multiple-accounts?
(rf/dispatch [:open-modal :screen/wallet.select-from])))
[multiple-accounts? first-account-address])
on-swap-press (rn/use-callback
(fn []
(rf/dispatch [:wallet.tokens/get-token-list])
(when-not multiple-accounts?
(rf/dispatch [:wallet/switch-current-viewing-account
first-account-address]))
(if multiple-accounts?
(rf/dispatch [:open-modal
:screen/wallet.swap-select-account])
(rf/dispatch [:open-modal
:screen/wallet.swap-select-asset-to-pay])))
[multiple-accounts? first-account-address])
theme (quo.theme/use-theme)]
(rn/use-effect (fn []
(when (and @account-list-ref (pos? (count cards)))
Expand Down Expand Up @@ -106,6 +151,15 @@
(when (ff/enabled? ::ff/wallet.graph)
[quo/wallet-graph {:time-frame :empty}])
[render-cards cards account-list-ref]
[quo/wallet-ctas
{:container-style style/cta-buttons
:send-action on-send-press
:receive-action on-receive-press
:buy-action on-buy-press
:bridge-action on-bridge-press
:swap-action on-swap-press
:bridge-disabled? testnet-mode?
:swap-disabled? testnet-mode?}]
[render-tabs tabs-data change-tab selected-tab]]
:content-container-style style/list-container
:sticky-header-indices [0]
Expand Down
8 changes: 5 additions & 3 deletions src/status_im/contexts/wallet/send/events.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,9 @@
[:wallet :ui :send]
dissoc
:token
:token-symbol :token-display-name
:tx-type :network)}))
:token-symbol
:token-display-name
:network)}))

(rf/reg-event-fx :wallet/clean-selected-collectible
(fn [{:keys [db]} [{:keys [ignore-entry-point?]}]]
Expand Down Expand Up @@ -739,6 +740,7 @@
token-symbol
address)]
(utils/token-with-balance token network-details)))
asset-selected? (or collectible-tx? (some? token))
bridge-tx? (= tx-type :tx/bridge)
flow-id (if bridge-tx?
:wallet-bridge-flow
Expand All @@ -761,7 +763,7 @@
network (assoc-in [:wallet :ui :send :network] network)
token-symbol (assoc-in [:wallet :ui :send :token] token)
bridge-tx? (assoc-in [:wallet :ui :send :to-address] address))
:fx (if (or no-tx-type? (some? network) collectible-tx?)
:fx (if (or no-tx-type? (some? network) collectible-tx? (not asset-selected?))
[[:dispatch [:wallet/switch-current-viewing-account address]]
[:dispatch
[:wallet/wizard-navigate-forward
Expand Down
15 changes: 9 additions & 6 deletions src/status_im/contexts/wallet/send/events_test.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,7 @@
(reset! rf-db/app-db
{:wallet {:ui {:send {:other-props :value
:token "ETH"
:token-display-name "ETH"
:tx-type :tx/collectible-erc-721}}}})
:token-display-name "ETH"}}}})
(is (match-strict? expected-db (:db (dispatch [event-id]))))))

(h/deftest-event :wallet/clean-selected-collectible
Expand Down Expand Up @@ -497,12 +496,16 @@
address "0x01"
network {:chain-id 1}]
(testing "when tx-type is :tx/bridge and token-symbol is nil"
(let [tx-type :tx/bridge
(let [flow-id :wallet-bridge-flow
tx-type :tx/bridge
expected-result {:db {:wallet {:ui {:send {:to-address address
:tx-type tx-type}}}}
:fx [[:dispatch [:dismiss-modal :screen/wallet.select-from]]
[:dispatch [:wallet/switch-current-viewing-account address]]
[:dispatch [:show-bottom-sheet {:content (m/pred fn?)}]]]}]
:fx [[:dispatch [:wallet/switch-current-viewing-account address]]
[:dispatch
[:wallet/wizard-navigate-forward
{:current-screen stack-id
:start-flow? start-flow?
:flow-id flow-id}]]]}]
(reset! rf-db/app-db {:wallet {:ui {:send {:tx-type tx-type}}}})
(is (match? expected-result
(dispatch [event-id
Expand Down
19 changes: 13 additions & 6 deletions src/status_im/contexts/wallet/send/from/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
[utils.re-frame :as rf]))

(defn- on-account-press
[address network-details general-flow? collectible-tx?]
[address network-details general-flow? collectible-tx? token-selected?]
(when general-flow?
(rf/dispatch [:wallet/clean-selected-token])
(rf/dispatch [:wallet/clean-selected-collectible]))
(rf/dispatch [:wallet/select-from-account
{:address address
:network-details network-details
:stack-id :screen/wallet.select-from
:start-flow? (not (or general-flow? collectible-tx?))}]))
:start-flow? (not (or general-flow? collectible-tx? token-selected?))}]))

(defn- on-close
[]
(rf/dispatch [:wallet/clean-selected-collectible {:ignore-entry-point? true}])
(rf/dispatch [:wallet/clean-current-viewing-account]))

(defn- render-fn
[item _ _ {:keys [general-flow? network-details collectible-tx? collectible]}]
[item _ _ {:keys [general-flow? network-details collectible-tx? collectible token]}]
(let [account-address (:address item)
balance (cond
general-flow? 0
Expand All @@ -42,8 +42,14 @@
asset-value (if collectible-tx? (str balance) (:asset-pay-balance item))]
[quo/account-item
{:type (if has-balance? :tag :default)
:on-press #(on-account-press account-address network-details general-flow? collectible-tx?)
:state (if (or has-balance? general-flow?) :default :disabled)
:on-press #(on-account-press account-address
network-details
general-flow?
collectible-tx?
(and (nil? collectible) (nil? token)))
:state (if (or has-balance? general-flow? (and (nil? collectible) (nil? token)))
:default
:disabled)
:token-props (when-not general-flow?
{:symbol asset-symbol
:value asset-value})
Expand Down Expand Up @@ -80,6 +86,7 @@
:render-data {:general-flow? general-flow?
:network-details network-details
:collectible-tx? collectible-tx?
:collectible collectible}
:collectible collectible
:token token}
:render-fn render-fn
:shows-horizontal-scroll-indicator false}]]))
19 changes: 12 additions & 7 deletions src/status_im/contexts/wallet/swap/events.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,10 +571,15 @@
(fn [{:keys [db]} [account]]
(let [asset-to-pay (get-in db [:wallet :ui :swap :asset-to-pay])
asset-to-receive (get-in db [:wallet :ui :swap :asset-to-receive])]
{:fx [[:dispatch [:dismiss-modal :screen/wallet.swap-select-account]]
[:dispatch
[:wallet.swap/start
{:asset-to-pay asset-to-pay
:asset-to-receive asset-to-receive
:open-new-screen? true
:from-account account}]]]})))
{:fx (if asset-to-pay
[[:dispatch [:dismiss-modal :screen/wallet.swap-select-account]]
[:dispatch
[:wallet.swap/start
{:asset-to-pay asset-to-pay
:asset-to-receive asset-to-receive
:open-new-screen? true
:from-account account}]]]
[[:dispatch [:wallet/switch-current-viewing-account (:address account)]]
[:dispatch
[:navigate-to-within-stack
[:screen/wallet.swap-select-asset-to-pay :screen/wallet.swap-select-account]]]])})))
11 changes: 6 additions & 5 deletions src/status_im/contexts/wallet/swap/select_account/view.cljs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
[utils.re-frame :as rf]))

(defn- on-account-press
[account]
(rf/dispatch [:wallet.swap/start-from-account account]))
[account asset-to-pay]
(rf/dispatch [:wallet.swap/start-from-account account asset-to-pay]))

(defn- render-fn
[item _ _]
[item _ _ {:keys [asset-to-pay]}]
(let [has-balance (money/above-zero? (:asset-pay-balance item))]
[quo/account-item
{:type (if has-balance :tag :default)
:on-press #(on-account-press item)
:state (if has-balance :default :disabled)
:on-press #(on-account-press item asset-to-pay)
:state (if (or has-balance (nil? asset-to-pay)) :default :disabled)
:token-props {:symbol (:asset-pay-symbol item)
:value (:asset-pay-balance item)}
:account-props (assoc item
Expand Down Expand Up @@ -49,5 +49,6 @@
{:style style/accounts-list
:content-container-style style/accounts-list-container
:data accounts
:render-data {:asset-to-pay asset-to-pay}
:render-fn render-fn
:shows-horizontal-scroll-indicator false}]]))

0 comments on commit ca748e5

Please sign in to comment.