From 34cf65bfc999a21f5d0cb86c9c6cc931b0ec44df Mon Sep 17 00:00:00 2001
From: Omar Basem <omarbasem.0101@gmail.com>
Date: Tue, 21 May 2024 11:19:22 +0400
Subject: [PATCH] fix: overlapping send details (#20102)

* fix: overlapping send details (#20102)
---
 .../contexts/wallet/send/input_amount/view.cljs          | 9 +++------
 .../wallet/send/transaction_confirmation/view.cljs       | 5 ++---
 translations/en.json                                     | 2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/status_im/contexts/wallet/send/input_amount/view.cljs b/src/status_im/contexts/wallet/send/input_amount/view.cljs
index a9174c0ae91..8ae42b53a4d 100644
--- a/src/status_im/contexts/wallet/send/input_amount/view.cljs
+++ b/src/status_im/contexts/wallet/send/input_amount/view.cljs
@@ -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
diff --git a/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs b/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs
index 48153dd7ef0..3c033840866 100644
--- a/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs
+++ b/src/status_im/contexts/wallet/send/transaction_confirmation/view.cljs
@@ -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
diff --git a/translations/en.json b/translations/en.json
index c1aed2d5529..ca128d5fd39 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -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",