wip

fastlane/Gemfile.lock

@@ -219,6 +219,7 @@ PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
   x86_64-darwin-22
+  x86_64-darwin-23
 
 DEPENDENCIES
   activesupport (>= 6.1.7.3, < 7.1.0)

ios/Podfile.lock

@@ -1490,7 +1490,7 @@ SPEC CHECKSUMS:
   FBLazyVector: 56e0e498dbb513b96c40bac6284729ba4e62672d
   FBReactNativeSpec: 146c741a3f40361f6bc13a4ba284678cbedb5881
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: c0eca6ffed0a6fde1965ef26dcc7bf528f052af4
+  glog: 36c15c01d70ed395c6e4f3619f98a23ee415b07a
   hermes-engine: 1d1835b2cc54c381909d94d1b3c8e0a2f1a94a0e
   HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
   Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8

src/status_im/contexts/wallet/bridge/input_amount/view.cljs

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

src/status_im/contexts/wallet/common/utils.cljs

@@ -27,12 +27,18 @@
   [balance]
   (cut-fiat-balance balance 2))
 
-(defn prettify-balance
-  [currency-symbol balance]
+(defn prepend-curency-symbol-to-fiat-balance
+  [fiat-balance currency-symbol]
   (let [formatted-symbol (if (> (count currency-symbol) 1)
                            (str currency-symbol " ")
                            currency-symbol)]
-    (str formatted-symbol (cut-fiat-balance-to-two-decimals balance))))
+    (str formatted-symbol fiat-balance)))
+
+(defn prettify-balance
+  [currency-symbol fiat-balance]
+  (-> fiat-balance
+      cut-fiat-balance-to-two-decimals
+      (prepend-curency-symbol-to-fiat-balance currency-symbol)))
 
 (defn get-derivation-path
   [number-of-accounts]
@@ -104,11 +110,15 @@
       :else                          (number/remove-trailing-zeroes
                                       (.toFixed token-units standardized-decimals-count)))))
 
+(defn add-token-symbol-to-crypto-balance
+  [crypto-balance token-symbol]
+  (str crypto-balance " " (string/upper-case token-symbol)))
+
 (defn prettify-crypto-balance
   [token-symbol crypto-balance conversion-rate]
-  (str (cut-crypto-decimals-to-fit-usd-cents crypto-balance conversion-rate)
-       " "
-       (string/upper-case token-symbol)))
+  (-> crypto-balance
+      (cut-crypto-decimals-to-fit-usd-cents conversion-rate)
+      (add-token-symbol-to-crypto-balance token-symbol)))
 
 (defn get-standard-crypto-format
   "For full details: https://github.com/status-im/status-mobile/issues/18225"

src/status_im/contexts/wallet/send/input_amount/component_spec.cljs

@@ -104,7 +104,7 @@
    :wallet/wallet-send-tx-type                     :tx/send
    :wallet/wallet-send-fee-fiat-formatted          "$5,00"
    :wallet/sending-collectible?                    false
-   :wallet/total-amount                            (money/bignumber "250")})
+   :wallet/total-amount-in-to-chains               (money/bignumber "250")})
 
 (h/describe "Send > input amount screen"
   (h/setup-restorable-re-frame)

src/status_im/contexts/wallet/send/input_amount/controlled_input_logic.cljs

@@ -0,0 +1,74 @@
+(ns status-im.contexts.wallet.send.input-amount.controlled-input-logic
+  (:require
+    [clojure.string :as string]
+    [status-im.contexts.wallet.common.utils :as wallet-utils]
+    [utils.money :as money]))
+
+(def ^:private default-max-limit 12)
+
+(def ^:private not-digits-or-dot-pattern
+  #"[^0-9+\.]")
+
+(def ^:private dot ".")
+
+(defn- can-add-character?
+  [input-value character max-length]
+  (let [length-overflow?    (>= (count input-value) max-length)
+        extra-dot?          (and (= character dot) (string/includes? input-value dot))
+        extra-leading-zero? (and (= input-value "0") (= "0" (str character)))
+        non-numeric?        (re-find not-digits-or-dot-pattern (str character))]
+    (not (or non-numeric? extra-dot? extra-leading-zero? length-overflow?))))
+
+(defn- normalize-value-as-numeric
+  [value character]
+  (cond
+    (and (string/blank? value) (= character dot))
+    (str "0" character)
+
+    (and (= value "0") (not= character dot))
+    (str character)
+
+    :else
+    (str value character)))
+
+(defn add-character
+  ([input-value character]
+   (add-character input-value character default-max-limit))
+  ([input-value character max-length]
+   (if (can-add-character? input-value character max-length)
+     (normalize-value-as-numeric input-value character)
+     input-value)))
+
+(defn delete-last
+  ([input-value]
+   (delete-last input-value ""))
+  ([input-value default-value]
+   (let [new-value (subs input-value 0 (dec (count input-value)))]
+     (if (string/blank? new-value)
+       default-value
+       new-value))))
+
+(defn upper-limit-exceeded?
+  [input-value upper-limit]
+  (and upper-limit
+       (when (money/bignumber? (money/bignumber input-value))
+         (money/greater-than (money/bignumber input-value) (money/bignumber upper-limit)))))
+
+(defn lower-limit-exceeded?
+  [input-value lower-limit]
+  (and lower-limit
+       (when (money/bignumber? (money/bignumber input-value))
+         (money/less-than (money/bignumber input-value) (money/bignumber lower-limit)))))
+
+(defn value-out-of-limits?
+  [input-value upper-limit lower-limit]
+  (or (upper-limit-exceeded? input-value upper-limit)
+      (lower-limit-exceeded? input-value lower-limit)))
+
+(defn value-numeric
+  [input-value]
+  (or (parse-double input-value) 0))
+
+(defn empty-value?
+  [input-value]
+  (or (string/blank? input-value) (<= (value-numeric input-value) 0)))

src/status_im/contexts/wallet/send/input_amount/controller.cljs

@@ -0,0 +1,497 @@
+(ns status-im.contexts.wallet.send.input-amount.controller
+  (:require
+    [clojure.string :as string]
+    [status-im.constants :as constants]
+    [status-im.contexts.wallet.common.utils :as utils]
+    [status-im.contexts.wallet.send.input-amount.controlled-input-logic :as controlled-input-logic]
+    [utils.money :as money]
+    [utils.number :as number]
+    [utils.re-frame :as rf]))
+
+;; notes
+;; token-by-symbol and token looks very similar but they have difference in market values data
+;; inside token structure :total-balance and :available-balance are same, not sure if they have
+;; different
+;; meaning
+
+;; subs
+
+(rf/reg-sub :layers/ui
+ :<- [:layers]
+ :-> :ui)
+
+(rf/reg-sub :ui/send
+ :<- [:layers/ui]
+ :-> :send)
+
+(rf/reg-sub :ui/send-input-amount-screen
+ :<- [:ui/send]
+ :-> :input-amount-screen)
+
+(rf/reg-sub :send-input-amount-screen/controller
+ :<- [:ui/send-input-amount-screen]
+ :-> :controller)
+
+(rf/reg-sub :send-input-amount-screen/currency-information
+ :<- [:wallet/wallet-send-token]
+ :<- [:profile/currency]
+ :<- [:profile/currency-symbol]
+ :<- [:profile/profile]
+ (fn [[{token-symbol :symbol
+        :as
+        token}
+       currency
+       currency-symbol
+       {fiat-currency :currency}]]
+   {:usd-conversion-rate (utils/token-usd-price token)
+    :currency            currency
+    :fiat-currency       fiat-currency
+    :currency-symbol     currency-symbol
+    :token-symbol        token-symbol
+    :conversion-rate     (-> token
+                             :market-values-per-currency
+                             currency
+                             :price)
+    :token-decimals      (-> token
+                             utils/token-usd-price
+                             utils/one-cent-value
+                             utils/calc-max-crypto-decimals)
+    :token               token}))
+
+(rf/reg-sub :send-input-amount-screen/max-decimals
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/currency-information]
+ :<- [:wallet/wallet-send-receiver-preferred-networks]
+ (fn [[{:keys [crypto-currency?]}
+       {:keys [token-decimals]}]]
+   (if crypto-currency? token-decimals 2)))
+
+(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)))
+
+(defn- every-network-value-is-zero?
+  [sender-network-values]
+  (every? (fn [{:keys [total-amount]}]
+            (and
+             total-amount
+             (money/bignumber? total-amount)
+             (money/equal-to total-amount
+                             (money/bignumber "0"))))
+          sender-network-values))
+
+(rf/reg-sub :send-input-amount-screen/routes-information
+ :<- [:wallet/wallet-send-route]
+ :<- [:wallet/wallet-send-sender-network-values]
+ :<- [:wallet/wallet-send-receiver-network-values]
+ :<- [:wallet/wallet-send-suggested-routes]
+ :<- [:wallet/wallet-send-loading-suggested-routes?]
+ :<- [:wallet/wallet-send-tx-type]
+ (fn [[route
+       sender-network-values
+       receiver-network-values
+       suggested-routes
+       loading-routes?
+       tx-type]]
+   (let [token-not-supported-in-receiver-networks? (and (not= tx-type :tx/bridge)
+                                                        (->> receiver-network-values
+                                                             (remove #(= (:type %) :add))
+                                                             (every? #(= (:type %) :not-available))))
+         routes                                    (when suggested-routes
+                                                     (or (:best suggested-routes) []))]
+     {:route                                     route
+      :sender-network-values                     sender-network-values
+      :receiver-network-values                   receiver-network-values
+      :suggested-routes                          suggested-routes
+      :loading-routes?                           loading-routes?
+      :routes                                    routes
+      :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
+      :no-routes-found?                          (and
+                                                  (every-network-value-is-zero?
+                                                   sender-network-values)
+                                                  (not (nil? routes))
+                                                  (not loading-routes?)
+                                                  (not token-not-supported-in-receiver-networks?))})))
+
+(rf/reg-sub :send-input-amount-screen/networks-information
+ :<- [:wallet/wallet-send-token]
+ :<- [:wallet/wallet-send-receiver-networks]
+ :<- [:wallet/wallet-send-receiver-preferred-networks]
+ (fn [[{token-networks :networks}
+       receiver-networks
+       receiver-preferred-networks]]
+   {:token-networks                   token-networks
+    :receiver-networks                receiver-networks
+    :sending-to-unpreferred-networks? (not (every? (fn [receiver-selected-network]
+                                                     (contains?
+                                                      (set receiver-preferred-networks)
+                                                      receiver-selected-network))
+                                                   receiver-networks))}))
+
+(rf/reg-sub :send-input-amount-screen/token-by-symbol
+ :<- [:send-input-amount-screen/enabled-from-chain-ids]
+ :<- [:send-input-amount-screen/currency-information]
+ (fn [[enabled-from-chain-ids {:keys [token-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/upper-limit
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/currency-information]
+ :<- [:send-input-amount-screen/total-balance]
+ (fn [[{:keys [crypto-currency?]}
+       {:keys [usd-conversion-rate conversion-rate]}
+       total-balance]]
+   (if crypto-currency?
+     (utils/cut-crypto-decimals-to-fit-usd-cents
+      total-balance
+      usd-conversion-rate)
+     (-> (money/crypto->fiat
+          total-balance
+          conversion-rate)
+         utils/cut-fiat-balance-to-two-decimals))))
+
+(rf/reg-sub
+ :send-input-amount-screen/amount-in-crypto
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/currency-information]
+ (fn [[{:keys [crypto-currency? token-input-value]}
+       {:keys [conversion-rate token-decimals]}]]
+   (if crypto-currency?
+     token-input-value
+     (number/remove-trailing-zeroes
+      (.toFixed (/ token-input-value conversion-rate)
+                token-decimals)))))
+
+(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/controller]
+ :<- [:send-input-amount-screen/currency-information]
+ (fn [[{:keys [crypto-currency? token-input-value]}
+       {:keys [conversion-rate]}]]
+   (if crypto-currency?
+     (crypto->fiat token-input-value conversion-rate)
+     (fiat->crypto token-input-value conversion-rate))))
+
+(rf/reg-sub :send-input-amount-screen/token-input-converted-value-prettified
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/token-input-converted-value]
+ :<- [:send-input-amount-screen/currency-information]
+ (fn [[{:keys [crypto-currency?]}
+       token-input-converted-value
+       {:keys [currency-symbol token-symbol]}]]
+   (if crypto-currency?
+     (utils/prepend-curency-symbol-to-fiat-balance token-input-converted-value currency-symbol)
+     (utils/add-token-symbol-to-crypto-balance token-input-converted-value
+                                               (or (clj->js token-symbol) "")))))
+
+(rf/reg-sub :send-input-amount-screen/upper-limit-prettified
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/currency-information]
+ :<- [:send-input-amount-screen/upper-limit]
+ (fn [[{:keys [crypto-currency?]}
+       {:keys [currency-symbol token-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/value-out-of-limits?
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/upper-limit]
+ (fn [[{:keys [token-input-value]}
+       upper-limit]]
+   (controlled-input-logic/value-out-of-limits? token-input-value upper-limit 0)))
+
+(rf/reg-sub :send-input-amount-screen/recipient-gets-amount
+ :<- [:send-input-amount-screen/currency-information]
+ :<- [:wallet/total-amount-in-to-chains]
+ (fn [[{:keys [conversion-rate token-symbol]}
+       total-amount-receiver]]
+   (utils/prettify-crypto-balance
+    token-symbol
+    total-amount-receiver
+    conversion-rate)))
+
+(rf/reg-sub :send-input-amount-screen/owned-eth-balance-is-zero?
+ :<- [:send-input-amount-screen/enabled-from-chain-ids]
+ (fn [enabled-from-chain-ids]
+   (let [owned-eth-token (rf/sub [:wallet/token-by-symbol
+                                  (string/upper-case
+                                   constants/mainnet-short-name)
+                                  enabled-from-chain-ids])]
+     (money/equal-to (:total-balance owned-eth-token) 0))))
+
+(rf/reg-sub :send-input-amount-screen/fee-formatted
+ :<- [:send-input-amount-screen/routes-information]
+ (fn [{:keys [route]}]
+   (let [native-currency-symbol (when-not (or (nil? route) (empty? route))
+                                  (get-in (first route)
+                                          [:from :native-currency-symbol]))]
+     (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol]))))
+
+(rf/reg-sub :send-input-amount-screen/upper-limit-exceeded?
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/upper-limit]
+ (fn [[{:keys [token-input-value]}
+       upper-limit]]
+   (controlled-input-logic/upper-limit-exceeded?
+    token-input-value
+    upper-limit)))
+
+(rf/reg-sub :send-input-amount-screen/upper-limit-equals-input-value?
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/upper-limit]
+ (fn [[{:keys [token-input-value]}
+       upper-limit]]
+   (money/equal-to
+    (money/bignumber token-input-value)
+    (money/bignumber upper-limit))))
+
+(rf/reg-sub :send-input-amount-screen/should-try-again?
+ :<- [:send-input-amount-screen/upper-limit-exceeded?]
+ :<- [:send-input-amount-screen/routes-information]
+ (fn [[upper-limit-exceeded?
+       {:keys [no-routes-found?]}]]
+   (and (not upper-limit-exceeded?) no-routes-found?)))
+
+(rf/reg-sub :send-input-amount-screen/not-enough-asset?
+ :<- [:send-input-amount-screen/upper-limit-exceeded?]
+ :<- [:send-input-amount-screen/upper-limit-equals-input-value?]
+ :<- [:send-input-amount-screen/routes-information]
+ :<- [:send-input-amount-screen/currency-information]
+ :<- [:send-input-amount-screen/owned-eth-balance-is-zero?]
+ (fn [[upper-limit-exceeded?
+       upper-limit-equals-input-value?
+       {:keys [sender-network-values no-routes-found?]}
+       {:keys [token-symbol]}
+       owned-eth-balance-is-zero?]]
+   (and
+    (or no-routes-found? upper-limit-exceeded?)
+    (not-empty sender-network-values)
+    (if (= token-symbol
+           (string/upper-case
+            constants/mainnet-short-name))
+      upper-limit-equals-input-value?
+      owned-eth-balance-is-zero?))))
+
+(rf/reg-sub :send-input-amount-screen/show-no-routes?
+ :<- [:send-input-amount-screen/upper-limit-exceeded?]
+ :<- [:send-input-amount-screen/routes-information]
+ :<- [:send-input-amount-screen/not-enough-asset?]
+ (fn [[upper-limit-exceeded?
+       {:keys [sender-network-values no-routes-found?]}
+       not-enough-asset?]]
+   (and
+    (or no-routes-found? upper-limit-exceeded?)
+    (not-empty sender-network-values)
+    (not not-enough-asset?))))
+
+(comment
+  (rf/sub [:send-input-amount-screen/not-enough-asset?])
+  (rf/sub [:send-input-amount-screen/upper-limit-equals-input-value?])
+  (:no-routes-found? (rf/sub [:send-input-amount-screen/routes-information]))
+  (:sender-network-values (rf/sub [:send-input-amount-screen/currency-information]))
+  (rf/sub [:send-input-amount-screen/not-enough-asset?]))
+
+
+(rf/reg-sub :send-input-amount-screen/view-subs
+ :<- [:send-input-amount-screen/currency-information]
+ :<- [:send-input-amount-screen/value-out-of-limits?]
+ :<- [:send-input-amount-screen/routes-information]
+ :<- [:send-input-amount-screen/networks-information]
+ :<- [:send-input-amount-screen/recipient-gets-amount]
+ :<- [:send-input-amount-screen/max-decimals]
+ :<- [:send-input-amount-screen/fee-formatted]
+ :<- [:wallet/current-viewing-account-address]
+ :<- [:send-input-amount-screen/not-enough-asset?]
+ :<- [:send-input-amount-screen/show-no-routes?]
+ (fn
+   [[{:keys [token-symbol] :as currency-information}
+     value-out-of-limits?
+     {:keys [route
+             sender-network-values
+             loading-routes?
+             token-not-supported-in-receiver-networks?
+             no-routes-found?]
+      :as   routes-information}
+     {:keys [token-networks
+             receiver-networks]}
+     recipient-gets-amount
+     max-decimals
+     fee-formatted
+     current-address
+     not-enough-asset?
+     show-no-routes?]]
+   {:token-symbol                              token-symbol
+    :value-out-of-limits?                      value-out-of-limits?
+    :route                                     route
+    :sender-network-values                     sender-network-values
+    :loading-routes?                           loading-routes?
+    :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
+    :token-networks                            token-networks
+    :receiver-networks                         receiver-networks
+    :recipient-gets-amount                     recipient-gets-amount
+    :max-decimals                              max-decimals
+    :fee-formatted                             fee-formatted
+    :no-routes-found?                          no-routes-found?
+    :current-address                           current-address
+    :not-enough-asset?                         not-enough-asset?
+    :show-no-routes?                           show-no-routes?}))
+
+(rf/reg-sub :send-input-amount-screen/token-input-subs
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/currency-information]
+ :<- [:send-input-amount-screen/token-input-converted-value]
+ :<- [:send-input-amount-screen/token-input-converted-value-prettified]
+ :<- [:send-input-amount-screen/value-out-of-limits?]
+ :<- [:send-input-amount-screen/upper-limit-prettified]
+ :<- [:send-input-amount-screen/from-enabled-networks]
+ (fn
+   [[{:keys [crypto-currency? token-input-value] :as controller}
+     {:keys [fiat-currency token-symbol] :as currency-information}
+     token-input-converted-value
+     token-input-converted-value-prettified
+     value-out-of-limits?
+     upper-limit-prettified
+     from-enabled-networks]]
+   {:crypto-currency?                       crypto-currency?
+    :fiat-currency                          fiat-currency
+    :token-symbol                           token-symbol
+    :upper-limit-prettified                 upper-limit-prettified
+    :input-value                            token-input-value
+    :value-out-of-limits?                   value-out-of-limits?
+    :token-input-converted-value            token-input-converted-value
+    :token-input-converted-value-prettified token-input-converted-value-prettified
+    :from-enabled-networks                  from-enabled-networks}))
+
+(rf/reg-sub :send-input-amount-screen/routes-subs
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/currency-information]
+ :<- [:send-input-amount-screen/amount-in-crypto]
+ :<- [:send-input-amount-screen/value-out-of-limits?]
+ :<- [:send-input-amount-screen/routes-information]
+ :<- [:send-input-amount-screen/token-by-symbol]
+ :<- [:send-input-amount-screen/upper-limit-exceeded?]
+
+ (fn
+   [[{:keys [token-input-value] :as controller}
+     {:keys [token] :as currency-information}
+     amount-in-crypto
+     value-out-of-limits?
+     {:keys [routes
+             token-not-supported-in-receiver-networks?]
+      :as   routes-information}
+     token-by-symbol
+     upper-limit-exceeded?]]
+   {:token                                     token
+    :valid-input?                              (not (or (controlled-input-logic/empty-value?
+                                                         token-input-value)
+                                                        value-out-of-limits?))
+    :upper-limit-exceeded?                     upper-limit-exceeded?
+    :amount-in-crypto                          amount-in-crypto
+    :routes                                    routes
+    :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
+    :token-by-symbol                           token-by-symbol}))
+
+(rf/reg-sub :send-input-amount-screen/bottom-actions-subs
+ :<- [:send-input-amount-screen/controller]
+ :<- [:send-input-amount-screen/amount-in-crypto]
+ :<- [:send-input-amount-screen/value-out-of-limits?]
+ :<- [:send-input-amount-screen/routes-information]
+ :<- [:send-input-amount-screen/networks-information]
+ :<- [:send-input-amount-screen/token-by-symbol]
+ :<- [:send-input-amount-screen/should-try-again?]
+ (fn
+   [[{:keys [token-input-value] :as controller}
+     amount-in-crypto
+     value-out-of-limits?
+     {:keys [route loading-routes?]
+      :as   routes-information}
+     {:keys [sending-to-unpreferred-networks?]}
+     token-by-symbol
+     should-try-again?]]
+   {:valid-input?                     (not (or (controlled-input-logic/empty-value?
+                                                token-input-value)
+                                               value-out-of-limits?))
+    :amount-in-crypto                 amount-in-crypto
+    :route                            route
+    :loading-routes?                  loading-routes?
+    :token-by-symbol                  token-by-symbol
+    :sending-to-unpreferred-networks? sending-to-unpreferred-networks?
+    :should-try-again?                should-try-again?}))
+
+
+;; events
+(def token-input-value-path [:layers :ui :send :input-amount-screen :controller :token-input-value])
+
+(rf/reg-event-fx :send-input-amount-screen/set-input-state
+ (fn [{:keys [db]} [f]]
+   {:db (update-in db [:layers :ui :send :input-amount-screen :controller :input-state] f)}))
+
+(rf/reg-event-fx :send-input-amount-screen/set-token-input-value
+ (fn [{:keys [db]} [v]]
+   {:db (assoc-in db token-input-value-path v)}))
+
+
+(rf/reg-event-fx :send-input-amount-screen/swap-between-fiat-and-crypto
+ (fn [{:keys [db]} [token-input-converted-value]]
+   {:db (update-in db [:layers :ui :send :input-amount-screen :controller :crypto-currency?] not)
+    :fx [[:dispatch
+          [:send-input-amount-screen/set-token-input-value token-input-converted-value]]]}))
+
+
+(rf/reg-event-fx :send-input-amount-screen/token-input-add-character
+ (fn [{:keys [db]} [c max-decimals]]
+   (let [input-value   (get-in db token-input-value-path)
+         new-text      (str input-value c)
+         regex-pattern (str "^\\d*\\.?\\d{0," max-decimals "}$")
+         regex         (re-pattern regex-pattern)]
+     (when (re-matches regex new-text)
+       {:db (update-in db token-input-value-path #(controlled-input-logic/add-character % c))}))))
+
+(rf/reg-event-fx :send-input-amount-screen/token-input-delete-last
+ (fn [{:keys [db]}]
+   {:db (update-in db token-input-value-path controlled-input-logic/delete-last)}))
+
+(rf/reg-event-fx :send-input-amount-screen/token-input-delete-all
+ (fn [{:keys [db]}]
+   {:db (assoc-in db token-input-value-path "")}))
+
+

src/status_im/contexts/wallet/send/input_amount/view.cljs

@@ -1,16 +1,13 @@
 (ns status-im.contexts.wallet.send.input-amount.view
   (:require
-    [clojure.string :as string]
     [quo.core :as quo]
     [quo.foundations.colors :as colors]
     [quo.theme]
     [react-native.core :as rn]
     [react-native.safe-area :as safe-area]
-    [status-im.common.controlled-input.utils :as controlled-input]
-    [status-im.constants :as constants]
     [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.utils :as utils]
+    [status-im.contexts.wallet.send.input-amount.controller]
     [status-im.contexts.wallet.send.input-amount.style :as style]
     [status-im.contexts.wallet.send.routes.view :as routes]
     [status-im.contexts.wallet.sheets.buy-token.view :as buy-token]
@@ -19,12 +16,10 @@
     [status-im.setup.hot-reload :as hot-reload]
     [utils.debounce :as debounce]
     [utils.i18n :as i18n]
-    [utils.money :as money]
-    [utils.number :as number]
     [utils.re-frame :as rf]))
 
 (defn- estimated-fees
-  [{:keys [loading-routes? fees amount]}]
+  [{:keys [loading-routes? fees recipient-gets-amount]}]
   [rn/view {:style style/estimated-fees-container}
    (when (ff/enabled? ::ff/wallet.advanced-sending)
      [rn/view {:style style/estimated-fees-content-container}
@@ -48,20 +43,12 @@
      :status          (if loading-routes? :loading :default)
      :size            :small
      :title           (i18n/label :t/recipient-gets)
-     :subtitle        amount}]])
+     :subtitle        recipient-gets-amount}]])
+
 
-(defn- every-network-value-is-zero?
-  [sender-network-values]
-  (every? (fn [{:keys [total-amount]}]
-            (and
-             total-amount
-             (money/bignumber? total-amount)
-             (money/equal-to total-amount
-                             (money/bignumber "0"))))
-          sender-network-values))
 
 (defn select-asset-bottom-sheet
-  [clear-input!]
+  []
   (let [{preselected-token-symbol :symbol} (rf/sub [:wallet/wallet-send-token])]
     [:<> ;; Need to be a `:<>` to keep `asset-list` scrollable.
      [quo/drawer-top
@@ -73,7 +60,8 @@
        :preselected-token-symbol preselected-token-symbol
        :on-token-press           (fn [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
   [token-symbol receiver-networks token-networks]
@@ -140,163 +128,122 @@
 
     :else (rf/dispatch [:wallet/stop-and-clean-suggested-routes])))
 
-(defn- get-fee-formatted
-  [route]
-  (when-let [native-currency-symbol (-> route first :from :native-currency-symbol)]
-    (rf/sub [:wallet/wallet-send-fee-fiat-formatted native-currency-symbol])))
+(defn token-input
+  []
+  (let [{:keys [crypto-currency?
+                upper-limit-prettified
+                input-value
+                value-out-of-limits?
+                token-input-converted-value
+                token-input-converted-value-prettified
+                fiat-currency
+                token-symbol
+                from-enabled-networks]} (rf/sub [:send-input-amount-screen/token-input-subs])
+        show-select-asset-sheet         #(rf/dispatch
+                                          [:show-bottom-sheet
+                                           {:content (fn [] [select-asset-bottom-sheet])}])]
+    [quo/token-input
+     {:container-style style/input-container
+      :token-symbol    token-symbol
+      :value           input-value
+      :on-swap         #(rf/dispatch [:send-input-amount-screen/swap-between-fiat-and-crypto
+                                      token-input-converted-value])
+      :on-token-press  show-select-asset-sheet
+      :error?          value-out-of-limits?
+      :currency-symbol (if crypto-currency? token-symbol fiat-currency)
+      :converted-value token-input-converted-value-prettified
+      :hint-component  [quo/network-tags
+                        {:networks (seq from-enabled-networks)
+                         :title    (i18n/label
+                                    :t/send-limit
+                                    {:limit upper-limit-prettified})
+                         :status   (when value-out-of-limits? :error)}]}]))
+(defn routes-view
+  [current-screen-id]
+  (let [{:keys [valid-input?
+                upper-limit-exceeded?
+                amount-in-crypto
+                routes
+                token-not-supported-in-receiver-networks?
+                token
+                token-by-symbol]} (rf/sub [:send-input-amount-screen/routes-subs])
+        request-fetch-routes      (fn [bounce-duration-ms]
+                                    (fetch-routes
+                                     {:amount                 amount-in-crypto
+                                      :valid-input?           valid-input?
+                                      :bounce-duration-ms     bounce-duration-ms
+                                      :token                  token
+                                      :reset-amounts-to-zero? (and upper-limit-exceeded?
+                                                                   (some? routes))}))]
+    [routes/view
+     {:token                                     token-by-symbol
+      :send-amount-in-crypto                     amount-in-crypto
+      :valid-input?                              valid-input?
+      :token-not-supported-in-receiver-networks? token-not-supported-in-receiver-networks?
+      :current-screen-id                         current-screen-id
+      :request-fetch-routes                      request-fetch-routes}]))
 
-(defn- insufficient-asset-amount?
-  [{:keys [token-symbol owned-eth-token input-state no-routes-found? limit-exceeded?
-           sender-network-values enough-assets?]}]
-  (let [eth-selected?              (= token-symbol (string/upper-case constants/mainnet-short-name))
-        zero-owned-eth?            (money/equal-to (:total-balance owned-eth-token) 0)
-        input-at-max-owned-amount? (money/equal-to
-                                    (controlled-input/value-bn input-state)
-                                    (controlled-input/upper-limit-bn input-state))
-        exceeded-input?            (if eth-selected?
-                                     input-at-max-owned-amount?
-                                     zero-owned-eth?)]
-    (and (or no-routes-found? limit-exceeded?)
-         (seq sender-network-values)
-         (or exceeded-input? (not enough-assets?)))))
+(defn bottom-actions
+  [on-confirm button-one-label button-one-props]
+  (let [{:keys [valid-input?
+                amount-in-crypto
+                route
+                loading-routes?
+                token-by-symbol
+                sending-to-unpreferred-networks?
+                should-try-again?]} (rf/sub [:send-input-amount-screen/bottom-actions-subs])]
+    [quo/bottom-actions
+     {:actions          :one-action
+      :button-one-label (if should-try-again?
+                          (i18n/label :t/try-again)
+                          button-one-label)
+      :button-one-props (merge (when-not should-try-again? button-one-props)
+                               {:disabled? (or loading-routes?
+                                               (and (not should-try-again?)
+                                                    (or (nil? route)
+                                                        (empty? route)
+                                                        (not valid-input?))))
+                                :on-press  (cond
+                                             should-try-again?
+                                             #(rf/dispatch [:wallet/start-get-suggested-routes
+                                                            {:amount        amount-in-crypto
+                                                             :updated-token token-by-symbol}])
+                                             sending-to-unpreferred-networks?
+                                             #(show-unpreferred-networks-alert on-confirm)
+                                             :else
+                                             #(on-confirm amount-in-crypto))}
+                               (when should-try-again?
+                                 {:type :grey}))}])
+)
 
 (defn view
   ;; crypto-decimals, limit-crypto and initial-crypto-currency? args are needed
   ;; for component tests only
-  [{default-on-confirm       :on-confirm
-    default-limit-crypto     :limit-crypto
-    default-crypto-decimals  :crypto-decimals
-    on-navigate-back         :on-navigate-back
-    button-one-label         :button-one-label
-    button-one-props         :button-one-props
-    current-screen-id        :current-screen-id
-    initial-crypto-currency? :initial-crypto-currency?
-    enabled-from-chain-ids   :enabled-from-chain-ids
-    from-enabled-networks    :from-enabled-networks
-    :or                      {initial-crypto-currency? true}}]
-  (let [view-id                          (rf/sub [:view-id])
-        active-screen?                   (= view-id current-screen-id)
-        bottom                           (safe-area/get-bottom)
-        [crypto-currency?
-         set-crypto-currency]            (rn/use-state initial-crypto-currency?)
-        handle-on-confirm                (fn [amount]
-                                           (rf/dispatch [:wallet/set-token-amount-to-send
-                                                         {:amount   amount
-                                                          :stack-id current-screen-id}]))
-        {fiat-currency :currency}        (rf/sub [:profile/profile])
-        {token-symbol   :symbol
-         token-networks :networks
-         :as            token}           (rf/sub [:wallet/wallet-send-token])
-        send-from-locked-amounts         (rf/sub [:wallet/wallet-send-from-locked-amounts])
-        {:keys [total-balance]
-         :as   token-by-symbol}          (rf/sub [:wallet/token-by-symbol
-                                                  (str token-symbol)
-                                                  enabled-from-chain-ids])
-        token-balance                    (or default-limit-crypto total-balance)
-        usd-conversion-rate              (utils/token-usd-price token)
-        currency                         (rf/sub [:profile/currency])
-        conversion-rate                  (-> token
-                                             :market-values-per-currency
-                                             currency
-                                             :price)
-        token-decimals                   (-> token
-                                             utils/token-usd-price
-                                             utils/one-cent-value
-                                             utils/calc-max-crypto-decimals)
-        [input-state set-input-state]    (rn/use-state controlled-input/init-state)
-        clear-input!                     #(set-input-state controlled-input/delete-all)
-        currency-symbol                  (rf/sub [:profile/currency-symbol])
-        loading-routes?                  (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
-        route                            (rf/sub [:wallet/wallet-send-route])
-        on-confirm                       (or default-on-confirm handle-on-confirm)
-        crypto-decimals                  (or token-decimals default-crypto-decimals)
-        max-limit                        (if crypto-currency?
-                                           (utils/cut-crypto-decimals-to-fit-usd-cents
-                                            token-balance
-                                            usd-conversion-rate)
-                                           (utils/cut-fiat-balance-to-two-decimals
-                                            (money/crypto->fiat token-balance conversion-rate)))
-        input-value                      (controlled-input/input-value input-state)
-        valid-input?                     (not (or (controlled-input/empty-value? input-state)
-                                                  (controlled-input/input-error input-state)))
-        amount-in-crypto                 (if crypto-currency?
-                                           input-value
-                                           (number/remove-trailing-zeroes
-                                            (.toFixed (/ input-value conversion-rate)
-                                                      crypto-decimals)))
-        total-amount-receiver            (rf/sub [:wallet/total-amount true])
-        amount-text                      (str (number/remove-trailing-zeroes
-                                               (.toFixed total-amount-receiver
-                                                         (min token-decimals 6)))
-                                              " "
-                                              token-symbol)
-        show-select-asset-sheet          #(rf/dispatch
-                                           [:show-bottom-sheet
-                                            {: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?)
-                                               receiver-networks)
-        input-error                      (controlled-input/input-error input-state)
-        limit-exceeded?                  (controlled-input/upper-limit-exceeded? input-state)
-        current-address                  (rf/sub [:wallet/current-viewing-account-address])
-        current-color                    (rf/sub [:wallet/current-viewing-account-color])
-        enough-assets?                   (rf/sub [:wallet/wallet-send-enough-assets?])
-        owned-eth-token                  (rf/sub [:wallet/token-by-symbol
-                                                  (string/upper-case constants/mainnet-short-name)
-                                                  enabled-from-chain-ids])
-        not-enough-asset?                (insufficient-asset-amount?
-                                          {:enough-assets?        enough-assets?
-                                           :token-symbol          token-symbol
-                                           :owned-eth-token       owned-eth-token
-                                           :input-state           input-state
-                                           :no-routes-found?      no-routes-found?
-                                           :limit-exceeded?       limit-exceeded?
-                                           :sender-network-values sender-network-values})
-        should-try-again?                (and (not limit-exceeded?)
-                                              no-routes-found?
-                                              (not not-enough-asset?))
-        show-no-routes?                  (and (or no-routes-found? limit-exceeded?)
-                                              (not-empty sender-network-values)
-                                              (not not-enough-asset?))
-        confirm-disabled?                (or (nil? route)
-                                             (empty? route)
-                                             (not valid-input?))
-        fee-formatted                    (when (or (not confirm-disabled?) not-enough-asset?)
-                                           (get-fee-formatted route))
-        request-fetch-routes             (fn [bounce-duration-ms]
-                                           (fetch-routes
-                                            {:amount                 amount-in-crypto
-                                             :valid-input?           valid-input?
-                                             :bounce-duration-ms     bounce-duration-ms
-                                             :token                  token
-                                             :reset-amounts-to-zero? (and limit-exceeded?
-                                                                          (some? routes))}))
-        swap-between-fiat-and-crypto     (fn []
-                                           (if crypto-currency?
-                                             (set-input-state
-                                              #(controlled-input/->fiat % conversion-rate))
-                                             (set-input-state
-                                              #(controlled-input/->crypto % conversion-rate)))
-                                           (set-crypto-currency (not crypto-currency?)))]
+  [{on-confirm        :on-confirm
+    on-navigate-back  :on-navigate-back
+    button-one-label  :button-one-label
+    button-one-props  :button-one-props
+    current-screen-id :current-screen-id}]
+  (let [{:keys [value-out-of-limits?
+                route
+                sender-network-values
+                loading-routes?
+                token-not-supported-in-receiver-networks?
+                token-networks
+                receiver-networks
+                token-symbol
+                recipient-gets-amount
+                max-decimals
+                fee-formatted
+                no-routes-found?
+                current-address
+                not-enough-asset?
+                show-no-routes?]
+         :as   state}    (rf/sub [:send-input-amount-screen/view-subs])
+        view-id          (rf/sub [:view-id])
+        active-screen?   (= view-id current-screen-id)
+        bottom           (safe-area/get-bottom)
+        on-navigate-back on-navigate-back]
     (rn/use-effect
      (fn []
        (when active-screen?
@@ -310,125 +257,52 @@
     (hot-reload/use-safe-unmount on-navigate-back)
     (rn/use-effect
      (fn []
-       (set-input-state #(controlled-input/set-upper-limit % max-limit)))
-     [max-limit])
-    (rn/use-effect
-     (fn []
-       (when input-error
+       (when value-out-of-limits?
          (rf/dispatch [:wallet/stop-get-suggested-routes])
          (debounce/clear-all)))
-     [input-error])
+     [value-out-of-limits?])
     (rn/use-effect
      (fn []
-       (clear-input!)
+       (rf/dispatch [:send-input-amount-screen/token-input-delete-all])
        (rf/dispatch [:wallet/stop-and-clean-suggested-routes])
        (rf/dispatch [:wallet/clean-disabled-from-networks]))
      [current-address])
-    (rn/use-effect
-     (fn []
-       (request-fetch-routes 0))
-     [send-from-locked-amounts])
     [rn/view
      {:style               style/screen
       :accessibility-label (str "container"
-                                (when (controlled-input/input-error input-state) "-error"))}
+                                (when value-out-of-limits? "-error"))}
      [account-switcher/view
       {:icon-name     :i/arrow-left
        :on-press      #(rf/dispatch [:navigate-back])
        :switcher-type :select-account}]
-     [quo/token-input
-      {:container-style style/input-container
-       :token-symbol    token-symbol
-       :value           input-value
-       :on-swap         swap-between-fiat-and-crypto
-       :on-token-press  show-select-asset-sheet
-       :error?          (controlled-input/input-error input-state)
-       :currency-symbol (if crypto-currency? token-symbol fiat-currency)
-       :converted-value (if crypto-currency?
-                          (utils/prettify-balance
-                           currency-symbol
-                           (money/crypto->fiat input-value
-                                               conversion-rate))
-                          (utils/prettify-crypto-balance
-                           (or (clj->js token-symbol) "")
-                           (money/fiat->crypto input-value
-                                               conversion-rate)
-                           conversion-rate))
-       :hint-component  [quo/network-tags
-                         {:networks (seq from-enabled-networks)
-                          :title    (i18n/label
-                                     :t/send-limit
-                                     {:limit (if crypto-currency?
-                                               (utils/prettify-crypto-balance
-                                                (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
-      {:token                                     token-by-symbol
-       :send-amount-in-crypto                     amount-in-crypto
-       :valid-input?                              valid-input?
-       :token-not-supported-in-receiver-networks? unsupported-token-in-receiver?
-       :current-screen-id                         current-screen-id
-       :request-fetch-routes                      request-fetch-routes}]
+     [token-input]
+     [routes-view current-screen-id]
      (when (and (not loading-routes?)
                 sender-network-values
-                unsupported-token-in-receiver?)
+                token-not-supported-in-receiver-networks?)
        [token-not-available token-symbol receiver-networks token-networks])
-     (when not-enough-asset?
-       [not-enough-asset])
-     (when (or (and (not no-routes-found?) (or loading-routes? route))
-               not-enough-asset?)
+     (when (and (not no-routes-found?) (or loading-routes? route))
        [estimated-fees
-        {:loading-routes? loading-routes?
-         :fees            fee-formatted
-         :amount          amount-text}])
-     (when show-no-routes?
-       [no-routes-found])
-     [quo/bottom-actions
-      {:actions          :one-action
-       :button-one-label (if should-try-again?
-                           (i18n/label :t/try-again)
-                           button-one-label)
-       :button-one-props (merge (when-not should-try-again?
-                                  button-one-props)
-                                {:disabled?           (or not-enough-asset?
-                                                          loading-routes?
-                                                          (and (not should-try-again?)
-                                                               confirm-disabled?))
-                                 :on-press            (cond
-                                                        should-try-again?
-                                                        #(rf/dispatch [:wallet/start-get-suggested-routes
-                                                                       {:amount        amount-in-crypto
-                                                                        :updated-token token-by-symbol}])
-                                                        sending-to-unpreferred-networks?
-                                                        #(show-unpreferred-networks-alert on-confirm)
-                                                        :else
-                                                        #(on-confirm amount-in-crypto))
-                                 :customization-color current-color}
-                                (when should-try-again?
-                                  {:type :grey}))}]
+        {:loading-routes?       loading-routes?
+         :fees                  fee-formatted
+         :recipient-gets-amount recipient-gets-amount}])
+     (cond
+       show-no-routes?   [no-routes-found]
+       not-enough-asset? [not-enough-asset])
+     [bottom-actions on-confirm button-one-label button-one-props]
      [quo/numbered-keyboard
       {:container-style      (style/keyboard-container bottom)
        :left-action          :dot
        :delete-key?          true
        :on-press             (fn [c]
-                               (let [new-text      (str input-value c)
-                                     max-decimals  (if crypto-currency? crypto-decimals 2)
-                                     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)))))
+                               (rf/dispatch [:send-input-amount-screen/token-input-add-character c
+                                             max-decimals]))
        :on-delete            (fn []
                                (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]))
        :on-long-press-delete (fn []
                                (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]))}]]))
 

src/status_im/contexts/wallet/send/routes/view.cljs

@@ -340,15 +340,11 @@
   (let [token-symbol (:symbol token)
         nav-current-screen-id (rf/sub [:view-id])
         active-screen? (= nav-current-screen-id current-screen-id)
-        loading-routes? (rf/sub
-                         [:wallet/wallet-send-loading-suggested-routes?])
-        sender-network-values (rf/sub
-                               [:wallet/wallet-send-sender-network-values])
-        receiver-network-values (rf/sub
-                                 [:wallet/wallet-send-receiver-network-values])
+        loading-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
+        sender-network-values (rf/sub [:wallet/wallet-send-sender-network-values])
+        receiver-network-values (rf/sub [:wallet/wallet-send-receiver-network-values])
         network-links (rf/sub [:wallet/wallet-send-network-links])
-        disabled-from-chain-ids (rf/sub
-                                 [:wallet/wallet-send-disabled-from-chain-ids])
+        disabled-from-chain-ids (rf/sub [:wallet/wallet-send-disabled-from-chain-ids])
         {token-balances-per-chain :balances-per-chain} (rf/sub [:wallet/wallet-send-token])
         token-available-networks-for-suggested-routes
         (send-utils/token-available-networks-for-suggested-routes

src/status_im/contexts/wallet/send/send_amount/view.cljs

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

src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs

@@ -221,9 +221,8 @@
             bridge-to-network         (when bridge-to-chain-id
                                         (rf/sub [:wallet/network-details-by-chain-id
                                                  bridge-to-chain-id]))
-            loading-suggested-routes? (rf/sub
-                                       [:wallet/wallet-send-loading-suggested-routes?])
-            total-amount-receiver     (rf/sub [:wallet/total-amount true])
+            loading-suggested-routes? (rf/sub [:wallet/wallet-send-loading-suggested-routes?])
+            total-amount-receiver     (rf/sub [:wallet/total-amount-in-to-chains])
             from-account-props        {:customization-color account-color
                                        :size                32
                                        :emoji               (:emoji account)

src/status_im/db.cljs

@@ -2,6 +2,7 @@
   (:require
     [legacy.status-im.fleet.core :as fleet]
     [react-native.core :as rn]
+    [status-im.common.controlled-input.utils :as controlled-input]
     [status-im.contexts.shell.activity-center.events :as activity-center]
     [status-im.contexts.wallet.db :as wallet]))
 
@@ -43,4 +44,10 @@
    :stickers/packs-pending             #{}
    :settings/change-password           {}
    :keycard                            {}
-   :theme                              :light})
+   :theme                              :light
+   :layers                             {:ui
+                                        {:send
+                                         {:input-amount-screen
+                                          {:controller
+                                           {:crypto-currency?  true
+                                            :token-input-value ""}}}}}})

src/status_im/subs/root.cljs

@@ -196,3 +196,5 @@
 
 ;;keycard
 (reg-root-key-sub :keycard :keycard)
+
+(reg-root-key-sub :layers :layers)

src/status_im/subs/wallet/networks.cljs

@@ -75,15 +75,13 @@
       {}
       network-values))))
 
-(re-frame/reg-sub
- :wallet/total-amount
+(re-frame/reg-sub :wallet/total-amount-in-to-chains
  :<- [:wallet/wallet-send]
- (fn [{:keys [from-values-by-chain to-values-by-chain]} [_ to-values?]]
-   (let [network-values (if to-values? to-values-by-chain from-values-by-chain)]
-     (reduce
-      (fn [acc amount]
-        (if (money/bignumber? amount)
-          (money/add acc amount)
-          acc))
-      (money/bignumber 0)
-      (vals network-values)))))
+ (fn [{:keys [to-values-by-chain]}]
+   (reduce
+    (fn [acc amount]
+      (if (money/bignumber? amount)
+        (money/add acc amount)
+        acc))
+    (money/bignumber 0)
+    (vals to-values-by-chain))))