status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-21 23:28:39 +00:00
Code Issues Projects Releases Wiki Activity

first pack of subscriptions moved without losing functionality

Browse Source
This commit is contained in:
Volodymyr Kozieiev 2024-10-26 15:08:41 +01:00
parent b805cbcfe2
commit 51ccf0acc8
No known key found for this signature in database
GPG Key ID: 82B04968DF4C0535
7 changed files with 316 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/status_im/contexts/wallet/bridge/input_amount/view.cljs
View File

@ -10,17 +10,14 @@
[] []
[rn/view {:style style/bridge-send-wrapper} [rn/view {:style style/bridge-send-wrapper}
[input-amount/view [input-amount/view
{:current-screen-id :screen/wallet.bridge-input-amount {:current-screen-id :screen/wallet.bridge-input-amount
:button-one-label (i18n/label :t/review-bridge) :button-one-label (i18n/label :t/review-bridge)
:button-one-props {:icon-left :i/bridge} :button-one-props {:icon-left :i/bridge}
:enabled-from-chain-ids (rf/sub :on-confirm (fn [amount]
[:wallet/bridge-from-chain-ids]) (rf/dispatch [:wallet/set-token-amount-to-bridge
:from-enabled-networks (rf/sub [:wallet/bridge-from-networks]) {:amount amount
:on-confirm (fn [amount] :stack-id :screen/wallet.bridge-input-amount}]))
(rf/dispatch [:wallet/set-token-amount-to-bridge :on-navigate-back (fn []
{:amount amount (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
:stack-id :screen/wallet.bridge-input-amount}])) (rf/dispatch [:wallet/clean-disabled-from-networks])
:on-navigate-back (fn [] (rf/dispatch [:wallet/clean-send-amount]))}]])
(rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
(rf/dispatch [:wallet/clean-disabled-from-networks])
(rf/dispatch [:wallet/clean-send-amount]))}]])

6
src/status_im/contexts/wallet/db.cljs
View File

@ -12,6 +12,6 @@
;; tokens already exist in the app-db. ;; tokens already exist in the app-db.
:tokens-loading nil :tokens-loading nil
:active-tab :assets :active-tab :assets
:send {:input-amount-screen :screens {:input-amount-screen
{:crypto-currency? true {:crypto-currency? true
:token-input-value ""}}}}) :input-value ""}}}})

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

@ -3,12 +3,12 @@
[status-im.contexts.wallet.send.input-amount.controlled-input-logic :as controlled-input-logic] [status-im.contexts.wallet.send.input-amount.controlled-input-logic :as controlled-input-logic]
[utils.re-frame :as rf])) [utils.re-frame :as rf]))
(def token-input-value-path [:wallet :ui :send :input-amount-screen :token-input-value]) (def input-value-path [:wallet :ui :screens :input-amount-screen :input-value])
(def crypto-currency?-path [:layers :ui :send :input-amount-screen :controller :crypto-currency?]) (def crypto-currency?-path [:wallet :ui :screens :input-amount-screen :crypto-currency?])
(rf/reg-event-fx :send-input-amount-screen/set-token-input-value (rf/reg-event-fx :send-input-amount-screen/set-token-input-value
(fn [{:keys [db]} [v]] (fn [{:keys [db]} [v]]
{:db (assoc-in db token-input-value-path v)})) {:db (assoc-in db input-value-path v)}))
(rf/reg-event-fx :send-input-amount-screen/swap-between-fiat-and-crypto (rf/reg-event-fx :send-input-amount-screen/swap-between-fiat-and-crypto
(fn [{:keys [db]} [token-input-converted-value]] (fn [{:keys [db]} [token-input-converted-value]]
@ -18,19 +18,19 @@
(rf/reg-event-fx :send-input-amount-screen/token-input-add-character (rf/reg-event-fx :send-input-amount-screen/token-input-add-character
(fn [{:keys [db]} [c max-decimals]] (fn [{:keys [db]} [c max-decimals]]
(let [input-value (get-in db token-input-value-path) (let [input-value (get-in db input-value-path)
new-text (str input-value c) new-text (str input-value c)
regex-pattern (str "^\\d*\\.?\\d{0," max-decimals "}$") regex-pattern (str "^\\d*\\.?\\d{0," max-decimals "}$")
regex (re-pattern regex-pattern)] regex (re-pattern regex-pattern)]
(when (re-matches regex new-text) (when (re-matches regex new-text)
{:db (update-in db token-input-value-path #(controlled-input-logic/add-character % c))})))) {:db (update-in db input-value-path #(controlled-input-logic/add-character % c))}))))
(rf/reg-event-fx :send-input-amount-screen/token-input-delete-last (rf/reg-event-fx :send-input-amount-screen/token-input-delete-last
(fn [{:keys [db]}] (fn [{:keys [db]}]
{:db (update-in db token-input-value-path controlled-input-logic/delete-last)})) {:db (update-in db input-value-path controlled-input-logic/delete-last)}))
(rf/reg-event-fx :send-input-amount-screen/token-input-delete-all (rf/reg-event-fx :send-input-amount-screen/token-input-delete-all
(fn [{:keys [db]}] (fn [{:keys [db]}]
{:db (assoc-in db token-input-value-path "")})) {:db (assoc-in db input-value-path "")}))

294
src/status_im/contexts/wallet/send/input_amount/view.cljs
View File

@ -6,7 +6,6 @@
[quo.theme] [quo.theme]
[react-native.core :as rn] [react-native.core :as rn]
[react-native.safe-area :as safe-area] [react-native.safe-area :as safe-area]
[status-im.common.controlled-input.utils :as controlled-input]
[status-im.constants :as constants] [status-im.constants :as constants]
[status-im.contexts.wallet.common.account-switcher.view :as account-switcher] [status-im.contexts.wallet.common.account-switcher.view :as account-switcher]
[status-im.contexts.wallet.common.asset-list.view :as asset-list] [status-im.contexts.wallet.common.asset-list.view :as asset-list]
@ -63,7 +62,7 @@
sender-network-values)) sender-network-values))
(defn select-asset-bottom-sheet (defn select-asset-bottom-sheet
[clear-input!] []
(let [{preselected-token-symbol :symbol} (rf/sub [:wallet/wallet-send-token])] (let [{preselected-token-symbol :symbol} (rf/sub [:wallet/wallet-send-token])]
[:<> ;; Need to be a `:<>` to keep `asset-list` scrollable. [:<> ;; Need to be a `:<>` to keep `asset-list` scrollable.
[quo/drawer-top [quo/drawer-top
@ -75,7 +74,8 @@
:preselected-token-symbol preselected-token-symbol :preselected-token-symbol preselected-token-symbol
:on-token-press (fn [token] :on-token-press (fn [token]
(rf/dispatch [:wallet/edit-token-to-send token]) (rf/dispatch [:wallet/edit-token-to-send token])
(clear-input!))}]])) (rf/dispatch
[:send-input-amount-screen/token-input-delete-all]))}]]))
(defn- token-not-available (defn- token-not-available
[token-symbol receiver-networks token-networks] [token-symbol receiver-networks token-networks]
@ -148,16 +148,13 @@
(rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol]))) (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol])))
(defn- insufficient-asset-amount? (defn- insufficient-asset-amount?
[{:keys [token-symbol owned-eth-token input-state no-routes-found? limit-exceeded? [{:keys [token-symbol owned-eth-token upper-limit-equals-input-value? no-routes-found? limit-exceeded?
sender-network-values enough-assets?]}] sender-network-values enough-assets?]}]
(let [eth-selected? (= token-symbol (string/upper-case constants/mainnet-short-name)) (let [eth-selected? (= token-symbol (string/upper-case constants/mainnet-short-name))
zero-owned-eth? (money/equal-to (:total-balance owned-eth-token) 0) zero-owned-eth? (money/equal-to (:total-balance owned-eth-token) 0)
input-at-max-owned-amount? (money/equal-to exceeded-input? (if eth-selected?
(controlled-input/value-bn input-state) upper-limit-equals-input-value?
(controlled-input/upper-limit-bn input-state)) zero-owned-eth?)]
exceeded-input? (if eth-selected?
input-at-max-owned-amount?
zero-owned-eth?)]
(and (or no-routes-found? limit-exceeded?) (and (or no-routes-found? limit-exceeded?)
(seq sender-network-values) (seq sender-network-values)
(or exceeded-input? (not enough-assets?))))) (or exceeded-input? (not enough-assets?)))))
@ -165,140 +162,112 @@
(defn view (defn view
;; crypto-decimals, limit-crypto and initial-crypto-currency? args are needed ;; crypto-decimals, limit-crypto and initial-crypto-currency? args are needed
;; for component tests only ;; for component tests only
[{default-on-confirm :on-confirm [{default-on-confirm :on-confirm
default-limit-crypto :limit-crypto default-crypto-decimals :crypto-decimals
default-crypto-decimals :crypto-decimals on-navigate-back :on-navigate-back
on-navigate-back :on-navigate-back button-one-label :button-one-label
button-one-label :button-one-label button-one-props :button-one-props
button-one-props :button-one-props current-screen-id :current-screen-id}]
current-screen-id :current-screen-id (let [view-id (rf/sub [:view-id])
initial-crypto-currency? :initial-crypto-currency? active-screen? (= view-id current-screen-id)
enabled-from-chain-ids :enabled-from-chain-ids bottom (safe-area/get-bottom)
from-enabled-networks :from-enabled-networks handle-on-confirm (fn [amount]
:or {initial-crypto-currency? true}}] (rf/dispatch [:wallet/set-token-amount-to-send
(let [view-id (rf/sub [:view-id]) {:amount amount
active-screen? (= view-id current-screen-id) :stack-id current-screen-id}]))
bottom (safe-area/get-bottom) {:keys [input-value crypto-currency?]} (rf/sub [:send-input-amount-screen/state])
[crypto-currency? enabled-from-chain-ids (rf/sub
set-crypto-currency] (rn/use-state initial-crypto-currency?) [:send-input-amount-screen/enabled-from-chain-ids])
handle-on-confirm (fn [amount] from-enabled-networks (rf/sub [:send-input-amount-screen/from-enabled-networks])
(rf/dispatch [:wallet/set-token-amount-to-send {fiat-currency :currency} (rf/sub [:profile/profile])
{:amount amount
:stack-id current-screen-id}]))
{fiat-currency :currency} (rf/sub [:profile/profile])
{token-symbol :symbol {token-symbol :symbol
token-networks :networks token-networks :networks
:as token} (rf/sub [:wallet/wallet-send-token]) :as token} (rf/sub [:wallet/wallet-send-token])
send-from-locked-amounts (rf/sub [:wallet/wallet-send-from-locked-amounts]) send-from-locked-amounts (rf/sub [:wallet/wallet-send-from-locked-amounts])
{:keys [total-balance] token-by-symbol (rf/sub [:send-input-amount-screen/token-by-symbol])
:as token-by-symbol} (rf/sub [:wallet/token-by-symbol conversion-rate (rf/sub [:send-input-amount-screen/conversion-rate])
(str token-symbol) token-input-converted-value (rf/sub
enabled-from-chain-ids]) [:send-input-amount-screen/token-input-converted-value])
token-balance (or default-limit-crypto total-balance) token-decimals (rf/sub [:send-input-amount-screen/token-decimals])
usd-conversion-rate (utils/token-usd-price token) max-decimals (rf/sub [:send-input-amount-screen/max-decimals])
currency (rf/sub [:profile/currency]) currency-symbol (rf/sub [:profile/currency-symbol])
conversion-rate (-> token loading-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
:market-values-per-currency route (rf/sub [:wallet/wallet-send-route])
currency on-confirm (or default-on-confirm handle-on-confirm)
:price) crypto-decimals (or token-decimals default-crypto-decimals)
token-decimals (-> token valid-input? (rf/sub [:send-input-amount-screen/valid-input?])
utils/token-usd-price amount-in-crypto (if crypto-currency?
utils/one-cent-value input-value
utils/calc-max-crypto-decimals) (number/remove-trailing-zeroes
[input-state set-input-state] (rn/use-state controlled-input/init-state) (.toFixed (/ input-value conversion-rate)
clear-input! #(set-input-state controlled-input/delete-all) crypto-decimals)))
currency-symbol (rf/sub [:profile/currency-symbol]) total-amount-receiver (rf/sub [:wallet/total-amount true])
loading-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?]) amount-text (str (number/remove-trailing-zeroes
route (rf/sub [:wallet/wallet-send-route]) (.toFixed total-amount-receiver
on-confirm (or default-on-confirm handle-on-confirm) (min token-decimals 6)))
crypto-decimals (or token-decimals default-crypto-decimals) " "
max-limit (if crypto-currency? token-symbol)
(utils/cut-crypto-decimals-to-fit-usd-cents show-select-asset-sheet #(rf/dispatch
token-balance [:show-bottom-sheet
usd-conversion-rate) {:content (fn [] [select-asset-bottom-sheet])}])
(utils/cut-fiat-balance-to-two-decimals sender-network-values (rf/sub [:wallet/wallet-send-sender-network-values])
(money/crypto->fiat token-balance conversion-rate))) receiver-network-values (rf/sub [:wallet/wallet-send-receiver-network-values])
input-value (controlled-input/input-value input-state) tx-type (rf/sub [:wallet/wallet-send-tx-type])
valid-input? (not (or (controlled-input/empty-value? input-state) unsupported-token-in-receiver? (and (not= tx-type :tx/bridge)
(controlled-input/input-error input-state))) (->> receiver-network-values
amount-in-crypto (if crypto-currency? (remove #(= (:type %) :add))
input-value (every? #(= (:type %) :not-available))))
(number/remove-trailing-zeroes suggested-routes (rf/sub [:wallet/wallet-send-suggested-routes])
(.toFixed (/ input-value conversion-rate) routes (when suggested-routes
crypto-decimals))) (or (:best suggested-routes) []))
total-amount-receiver (rf/sub [:wallet/total-amount true]) no-routes-found? (and
amount-text (str (number/remove-trailing-zeroes (every-network-value-is-zero? sender-network-values)
(.toFixed total-amount-receiver (some? routes)
(min token-decimals 6))) (not loading-routes?)
" " (not unsupported-token-in-receiver?))
token-symbol) receiver-networks (rf/sub [:wallet/wallet-send-receiver-networks])
show-select-asset-sheet #(rf/dispatch receiver-preferred-networks (rf/sub [:wallet/wallet-send-receiver-preferred-networks])
[:show-bottom-sheet receiver-preferred-network? (set receiver-preferred-networks)
{:content (fn []
[select-asset-bottom-sheet
clear-input!])}])
sender-network-values (rf/sub [:wallet/wallet-send-sender-network-values])
receiver-network-values (rf/sub [:wallet/wallet-send-receiver-network-values])
tx-type (rf/sub [:wallet/wallet-send-tx-type])
unsupported-token-in-receiver? (and (not= tx-type :tx/bridge)
(->> receiver-network-values
(remove #(= (:type %) :add))
(every? #(= (:type %) :not-available))))
suggested-routes (rf/sub [:wallet/wallet-send-suggested-routes])
routes (when suggested-routes
(or (:best suggested-routes) []))
no-routes-found? (and
(every-network-value-is-zero? sender-network-values)
(some? routes)
(not loading-routes?)
(not unsupported-token-in-receiver?))
receiver-networks (rf/sub [:wallet/wallet-send-receiver-networks])
receiver-preferred-networks (rf/sub [:wallet/wallet-send-receiver-preferred-networks])
receiver-preferred-network? (set receiver-preferred-networks)
sending-to-unpreferred-networks? (some (comp not receiver-preferred-network?) sending-to-unpreferred-networks? (some (comp not receiver-preferred-network?)
receiver-networks) receiver-networks)
input-error (controlled-input/input-error input-state) value-out-of-limits? (rf/sub [:send-input-amount-screen/value-out-of-limits?])
limit-exceeded? (controlled-input/upper-limit-exceeded? input-state) limit-exceeded? (rf/sub [:send-input-amount-screen/upper-limit-exceeded?])
current-address (rf/sub [:wallet/current-viewing-account-address]) upper-limit-prettified (rf/sub [:send-input-amount-screen/upper-limit-prettified])
current-color (rf/sub [:wallet/current-viewing-account-color]) current-address (rf/sub [:wallet/current-viewing-account-address])
enough-assets? (rf/sub [:wallet/wallet-send-enough-assets?]) current-color (rf/sub [:wallet/current-viewing-account-color])
owned-eth-token (rf/sub [:wallet/token-by-symbol enough-assets? (rf/sub [:wallet/wallet-send-enough-assets?])
(string/upper-case constants/mainnet-short-name) upper-limit-equals-input-value? (rf/sub
enabled-from-chain-ids]) [:send-input-amount-screen/upper-limit-equals-input-value?])
not-enough-asset? (insufficient-asset-amount? owned-eth-token (rf/sub [:wallet/token-by-symbol
{:enough-assets? enough-assets? (string/upper-case constants/mainnet-short-name)
:token-symbol token-symbol enabled-from-chain-ids])
:owned-eth-token owned-eth-token not-enough-asset? (insufficient-asset-amount?
:input-state input-state {:enough-assets? enough-assets?
:no-routes-found? no-routes-found? :token-symbol token-symbol
:limit-exceeded? limit-exceeded? :owned-eth-token owned-eth-token
:sender-network-values sender-network-values}) :upper-limit-equals-input-value? upper-limit-equals-input-value?
should-try-again? (and (not limit-exceeded?) :no-routes-found? no-routes-found?
no-routes-found? :limit-exceeded? limit-exceeded?
(not not-enough-asset?)) :sender-network-values sender-network-values})
show-no-routes? (and (or no-routes-found? limit-exceeded?) should-try-again? (and (not limit-exceeded?)
(not-empty sender-network-values) no-routes-found?
(not not-enough-asset?)) (not not-enough-asset?))
confirm-disabled? (or (nil? route) show-no-routes? (and (or no-routes-found? limit-exceeded?)
(empty? route) (not-empty sender-network-values)
(not valid-input?)) (not not-enough-asset?))
fee-formatted (when (or (not confirm-disabled?) not-enough-asset?) confirm-disabled? (or (nil? route)
(get-fee-formatted route)) (empty? route)
request-fetch-routes (fn [bounce-duration-ms] (not valid-input?))
(fetch-routes fee-formatted (when (or (not confirm-disabled?) not-enough-asset?)
{:amount amount-in-crypto (get-fee-formatted route))
:valid-input? valid-input? request-fetch-routes (fn [bounce-duration-ms]
:bounce-duration-ms bounce-duration-ms (fetch-routes
:token token {:amount amount-in-crypto
:reset-amounts-to-zero? (and limit-exceeded? :valid-input? valid-input?
(some? routes))})) :bounce-duration-ms bounce-duration-ms
swap-between-fiat-and-crypto (fn [] :token token
(if crypto-currency? :reset-amounts-to-zero? (and limit-exceeded?
(set-input-state (some? routes))}))]
#(controlled-input/->fiat % conversion-rate))
(set-input-state
#(controlled-input/->crypto % conversion-rate)))
(set-crypto-currency (not crypto-currency?)))]
(rn/use-effect (rn/use-effect
(fn [] (fn []
(when active-screen? (when active-screen?
@ -312,17 +281,13 @@
(hot-reload/use-safe-unmount on-navigate-back) (hot-reload/use-safe-unmount on-navigate-back)
(rn/use-effect (rn/use-effect
(fn [] (fn []
(set-input-state #(controlled-input/set-upper-limit % max-limit))) (when value-out-of-limits?
[max-limit])
(rn/use-effect
(fn []
(when input-error
(rf/dispatch [:wallet/stop-get-suggested-routes]) (rf/dispatch [:wallet/stop-get-suggested-routes])
(debounce/clear-all))) (debounce/clear-all)))
[input-error]) [value-out-of-limits?])
(rn/use-effect (rn/use-effect
(fn [] (fn []
(clear-input!) (rf/dispatch [:send-input-amount-screen/token-input-delete-all])
(rf/dispatch [:wallet/stop-and-clean-suggested-routes]) (rf/dispatch [:wallet/stop-and-clean-suggested-routes])
(rf/dispatch [:wallet/clean-disabled-from-networks])) (rf/dispatch [:wallet/clean-disabled-from-networks]))
[current-address]) [current-address])
@ -333,7 +298,7 @@
[rn/view [rn/view
{:style style/screen {:style style/screen
:accessibility-label (str "container" :accessibility-label (str "container"
(when (controlled-input/input-error input-state) "-error"))} (when value-out-of-limits? "-error"))}
[account-switcher/view [account-switcher/view
{:icon-name :i/arrow-left {:icon-name :i/arrow-left
:on-press #(rf/dispatch [:navigate-back]) :on-press #(rf/dispatch [:navigate-back])
@ -342,9 +307,10 @@
{:container-style style/input-container {:container-style style/input-container
:token-symbol token-symbol :token-symbol token-symbol
:value input-value :value input-value
:on-swap swap-between-fiat-and-crypto :on-swap #(rf/dispatch [:send-input-amount-screen/swap-between-fiat-and-crypto
token-input-converted-value])
:on-token-press show-select-asset-sheet :on-token-press show-select-asset-sheet
:error? (controlled-input/input-error input-state) :error? value-out-of-limits?
:currency-symbol (if crypto-currency? token-symbol fiat-currency) :currency-symbol (if crypto-currency? token-symbol fiat-currency)
:converted-value (if crypto-currency? :converted-value (if crypto-currency?
(utils/prettify-balance (utils/prettify-balance
@ -360,15 +326,8 @@
{:networks (seq from-enabled-networks) {:networks (seq from-enabled-networks)
:title (i18n/label :title (i18n/label
:t/send-limit :t/send-limit
{:limit (if crypto-currency? {:limit upper-limit-prettified})
(utils/prettify-crypto-balance :status (when value-out-of-limits? :error)}]}]
(or (clj->js token-symbol) "")
(controlled-input/upper-limit-bn input-state)
conversion-rate)
(utils/prettify-balance currency-symbol
(controlled-input/upper-limit-bn
input-state)))})
:status (when (controlled-input/input-error input-state) :error)}]}]
[routes/view [routes/view
{:token token-by-symbol {:token token-by-symbol
:send-amount-in-crypto amount-in-crypto :send-amount-in-crypto amount-in-crypto
@ -418,19 +377,14 @@
:left-action :dot :left-action :dot
:delete-key? true :delete-key? true
:on-press (fn [c] :on-press (fn [c]
(let [new-text (str input-value c) (rf/dispatch [:send-input-amount-screen/token-input-add-character c
max-decimals (if crypto-currency? crypto-decimals 2) max-decimals]))
regex-pattern (str "^\\d*\\.?\\d{0," max-decimals "}$")
regex (re-pattern regex-pattern)]
(when (re-matches regex new-text)
(debounce/clear-all)
(set-input-state #(controlled-input/add-character % c)))))
:on-delete (fn [] :on-delete (fn []
(debounce/clear-all) (debounce/clear-all)
(set-input-state controlled-input/delete-last) (rf/dispatch [:send-input-amount-screen/token-input-delete-last])
(rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])) (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes]))
:on-long-press-delete (fn [] :on-long-press-delete (fn []
(debounce/clear-all) (debounce/clear-all)
(set-input-state controlled-input/delete-all) (rf/dispatch [:send-input-amount-screen/token-input-delete-all])
(rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes]))}]])) (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes]))}]]))

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

@ -8,12 +8,10 @@
(defn view (defn view
[] []
[input-amount/view [input-amount/view
{:current-screen-id :screen/wallet.send-input-amount {:current-screen-id :screen/wallet.send-input-amount
:button-one-label (i18n/label :t/review-send) :button-one-label (i18n/label :t/review-send)
:enabled-from-chain-ids (rf/sub [:wallet/wallet-send-enabled-from-chain-ids]) :on-navigate-back (fn []
:from-enabled-networks (rf/sub [:wallet/wallet-send-enabled-networks]) (rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes])
:on-navigate-back (fn [] (rf/dispatch [:wallet/clean-disabled-from-networks])
(rf/dispatch-sync [:wallet/stop-and-clean-suggested-routes]) (rf/dispatch [:wallet/clean-from-locked-amounts])
(rf/dispatch [:wallet/clean-disabled-from-networks]) (rf/dispatch [:wallet/clean-send-amount]))}])
(rf/dispatch [:wallet/clean-from-locked-amounts])
(rf/dispatch [:wallet/clean-send-amount]))}])

164
src/status_im/subs/wallet/screens/input_amount.cljs
View File

@ -1,20 +1,174 @@
(ns status-im.subs.wallet.screens.input-amount (ns status-im.subs.wallet.screens.input-amount
(:require (:require
[clojure.string :as string]
[status-im.constants :as constants]
[status-im.contexts.wallet.common.utils :as utils] [status-im.contexts.wallet.common.utils :as utils]
[status-im.contexts.wallet.send.input-amount.controlled-input-logic :as controlled-input-logic] [status-im.contexts.wallet.send.input-amount.controlled-input-logic :as controlled-input-logic]
[utils.money :as money] [utils.money :as money]
[utils.number :as number]
[utils.re-frame :as rf])) [utils.re-frame :as rf]))
(rf/reg-sub :send-input-amount-screen/state (rf/reg-sub :send-input-amount-screen/state
:<- [:wallet/wallet-send] :<- [:wallet/wallet-screens]
:-> :input-amount-screen) :-> :input-amount-screen)
(rf/reg-sub :send-input-amount-screen/enabled-from-chain-ids
:<- [:wallet/wallet-send-tx-type]
:<- [:wallet/wallet-send-enabled-from-chain-ids]
:<- [:wallet/bridge-from-chain-ids]
(fn [[tx-type send-chain-ids bridge-chain-ids]]
(if (= tx-type :tx/bridge)
bridge-chain-ids
send-chain-ids)))
(rf/reg-sub :send-input-amount-screen/from-enabled-networks
:<- [:wallet/wallet-send-tx-type]
:<- [:wallet/wallet-send-enabled-networks]
:<- [:wallet/bridge-from-networks]
(fn [[tx-type send-enabled-networks bridge-enabled-networks]]
(if (= tx-type :tx/bridge)
bridge-enabled-networks
send-enabled-networks)))
(rf/reg-sub :send-input-amount-screen/token-by-symbol
:<- [:send-input-amount-screen/enabled-from-chain-ids]
:<- [:wallet/wallet-send-token]
(fn [[enabled-from-chain-ids
{token-symbol :symbol}]]
(rf/sub [:wallet/token-by-symbol
(str token-symbol)
enabled-from-chain-ids])))
(rf/reg-sub :send-input-amount-screen/total-balance
:<- [:send-input-amount-screen/token-by-symbol]
(fn [{:keys [total-balance]}]
total-balance))
(rf/reg-sub :send-input-amount-screen/conversion-rate
:<- [:wallet/wallet-send-token]
:<- [:profile/currency]
(fn [[token
currency]]
(-> token
:market-values-per-currency
currency
:price)))
(rf/reg-sub :send-input-amount-screen/usd-conversion-rate
:<- [:wallet/wallet-send-token]
(fn [token]
(utils/token-usd-price token)))
(rf/reg-sub :send-input-amount-screen/token-decimals
:<- [:wallet/wallet-send-token]
(fn [token]
(-> token
utils/token-usd-price
utils/one-cent-value
utils/calc-max-crypto-decimals)))
(rf/reg-sub :send-input-amount-screen/max-decimals
:<- [:send-input-amount-screen/state]
:<- [:send-input-amount-screen/token-decimals]
(fn [[{:keys [crypto-currency?]}
token-decimals]]
(if crypto-currency? token-decimals 2)))
(rf/reg-sub :send-input-amount-screen/upper-limit
:<- [:send-input-amount-screen/state]
:<- [:send-input-amount-screen/conversion-rate]
:<- [:send-input-amount-screen/usd-conversion-rate]
:<- [:send-input-amount-screen/total-balance]
(fn [[{:keys [crypto-currency?]}
conversion-rate
usd-conversion-rate
total-balance]]
(if crypto-currency?
(utils/cut-crypto-decimals-to-fit-usd-cents
total-balance
usd-conversion-rate)
(utils/cut-fiat-balance-to-two-decimals
(money/crypto->fiat total-balance conversion-rate)))))
(rf/reg-sub :send-input-amount-screen/upper-limit-prettified
:<- [:send-input-amount-screen/state]
:<- [:profile/currency-symbol]
:<- [:wallet/wallet-send-token]
:<- [:send-input-amount-screen/conversion-rate]
:<- [:send-input-amount-screen/upper-limit]
(fn [[{:keys [crypto-currency?]}
currency-symbol
{token-symbol :symbol}
conversion-rate
upper-limit]]
(if crypto-currency?
(utils/prettify-crypto-balance
(or (clj->js token-symbol) "")
(money/bignumber upper-limit)
conversion-rate)
(utils/prettify-balance currency-symbol
(money/bignumber upper-limit)))
))
(rf/reg-sub :send-input-amount-screen/upper-limit-exceeded?
:<- [:send-input-amount-screen/state]
:<- [:send-input-amount-screen/upper-limit]
(fn [[{:keys [input-value]}
upper-limit]]
(controlled-input-logic/upper-limit-exceeded?
input-value
upper-limit)))
(rf/reg-sub :send-input-amount-screen/value-out-of-limits?
:<- [:send-input-amount-screen/state]
:<- [:send-input-amount-screen/upper-limit]
(fn [[{:keys [input-value]}
upper-limit]]
(controlled-input-logic/value-out-of-limits? input-value upper-limit 0)))
(rf/reg-sub :send-input-amount-screen/valid-input?
:<- [:send-input-amount-screen/state]
:<- [:send-input-amount-screen/value-out-of-limits?]
(fn [[{:keys [input-value]}
value-out-of-limits?]]
(not (or (controlled-input-logic/empty-value? input-value) value-out-of-limits?))))
(rf/reg-sub :send-input-amount-screen/upper-limit-equals-input-value?
:<- [:send-input-amount-screen/state]
:<- [:send-input-amount-screen/upper-limit]
(fn [[{:keys [input-value]}
upper-limit]]
(money/equal-to
(money/bignumber input-value)
(money/bignumber upper-limit))))
(defn- fiat->crypto
[value conversion-rate]
(-> value
(money/fiat->crypto conversion-rate)
(utils/cut-crypto-decimals-to-fit-usd-cents conversion-rate)))
(defn- crypto->fiat
[value conversion-rate]
(-> value
(money/crypto->fiat conversion-rate)
(utils/cut-fiat-balance-to-two-decimals)))
(rf/reg-sub :send-input-amount-screen/token-input-converted-value
:<- [:send-input-amount-screen/state]
:<- [:send-input-amount-screen/conversion-rate]
(fn [[{:keys [crypto-currency? input-value]}
conversion-rate]]
(if crypto-currency?
(crypto->fiat input-value conversion-rate)
(fiat->crypto input-value conversion-rate))))
(comment (comment
(inc 1) (inc 1)
(rf/sub [:wallet/wallet-send])
(rf/sub [:send-input-amount-screen/state]) (rf/sub [:send-input-amount-screen/state])
(rf/sub [:send-input-amount-screen/max-decimals])
(rf/sub [:send-input-amount-screen/enabled-from-chain-ids])
(rf/sub [:send-input-amount-screen/from-enabled-networks])
(rf/sub [:send-input-amount-screen/token-by-symbol])
(rf/sub [:view-id])
) )

5
src/status_im/subs/wallet/send.cljs
View File

@ -16,6 +16,11 @@
:<- [:wallet/ui] :<- [:wallet/ui]
:-> :send) :-> :send)
(rf/reg-sub
:wallet/wallet-screens
:<- [:wallet/ui]
:-> :screens)
(rf/reg-sub (rf/reg-sub
:wallet/send-recipient :wallet/send-recipient
:<- [:wallet/wallet-send] :<- [:wallet/wallet-send]