Skip to content

Commit

Permalink
fix: overlapping send details (#20102)
Browse files Browse the repository at this point in the history
* fix: overlapping send details (#20102)
  • Loading branch information
OmarBasem authored May 21, 2024
1 parent 88afa09 commit 34cf65b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
9 changes: 3 additions & 6 deletions src/status_im/contexts/wallet/send/input_amount/view.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
[status-im.contexts.wallet.send.routes.view :as routes]
[status-im.contexts.wallet.send.utils :as send-utils]
[status-im.contexts.wallet.sheets.unpreferred-networks-alert.view :as unpreferred-networks-alert]
[utils.address :as address]
[utils.debounce :as debounce]
[utils.i18n :as i18n]
[utils.money :as money]
Expand All @@ -35,7 +34,7 @@
(str currency-symbol amount))

(defn- estimated-fees
[{:keys [loading-routes? fees amount receiver]}]
[{:keys [loading-routes? fees amount]}]
[rn/view {:style style/estimated-fees-container}
[rn/view {:style style/estimated-fees-content-container}
[quo/button
Expand All @@ -59,7 +58,7 @@
:label :none
:status (if loading-routes? :loading :default)
:size :small
:title (i18n/label :t/user-gets {:name receiver})
:title (i18n/label :t/recipient-gets)
:subtitle amount}]])

(defn- every-network-value-is-zero?
Expand Down Expand Up @@ -162,7 +161,6 @@
loading-routes? (rf/sub
[:wallet/wallet-send-loading-suggested-routes?])
route (rf/sub [:wallet/wallet-send-route])
to-address (rf/sub [:wallet/wallet-send-to-address])
on-confirm (or default-on-confirm handle-on-confirm)
crypto-decimals (or token-decimals default-crypto-decimals)
current-crypto-limit (or default-limit-crypto
Expand Down Expand Up @@ -332,8 +330,7 @@
[estimated-fees
{:loading-routes? loading-routes?
:fees fee-formatted
:amount amount-text
:receiver (address/get-shortened-key to-address)}])
:amount amount-text}])
(when (or no-routes-found? limit-insufficient?)
[rn/view {:style style/no-routes-found-container}
[quo/info-message
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
:subtitle subtitle}])

(defn- transaction-details
[{:keys [estimated-time-min max-fees token-display-name amount to-address to-network route
[{:keys [estimated-time-min max-fees token-display-name amount to-network route
transaction-type
theme]}]
(let [currency-symbol (rf/sub [:profile/currency-symbol])
Expand Down Expand Up @@ -201,7 +201,7 @@
{:title (if (= transaction-type :tx/bridge)
(i18n/label :t/bridged-to
{:network (:abbreviated-name to-network)})
(i18n/label :t/user-gets {:name (utils/get-shortened-address to-address)}))
(i18n/label :t/recipient-gets))
:subtitle (str amount " " token-display-name)}]]
:else
[quo/text {:style {:align-self :center}}
Expand Down Expand Up @@ -297,7 +297,6 @@
:max-fees max-fees
:token-display-name token-display-name
:amount amount
:to-address to-address
:to-network bridge-to-network
:theme theme
:route route
Expand Down
2 changes: 1 addition & 1 deletion translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2516,7 +2516,7 @@
"this-address-has-no-activity": "This address has no activity",
"details": "Details",
"est-time": "Est. time",
"user-gets": "{{name}} gets",
"recipient-gets": "Recipient gets",
"slide-to-send": "Slide to send",
"generate-new-keypair": "Generate new key pair",
"import-using-phrase": "Import using recovery phrase",
Expand Down

0 comments on commit 34cf65b

Please sign in to comment.