status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-01-13 18:25:45 +00:00
Code Issues Projects Releases Wiki Activity

fix: overlapping send details (#20102)

Browse Source 
* fix: overlapping send details (#20102)
This commit is contained in:
Omar Basem 2024-05-21 11:19:22 +04:00 committed by GitHub
parent 88afa09baf
commit 34cf65bfc9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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]
@ -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
@ -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?
@ -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
@ -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

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

@ -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])
@ -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}}
@ -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

2
translations/en.json
View File

@ -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",