From 2ba21aab5c16433fe80e39f98dd1e04e5fc3a5ef Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 19 Oct 2018 13:34:18 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/domain/wallet/BtcCashEngine.java    |  4 ++--
 .../java/com/tangem/domain/wallet/BtcEngine.java   |  4 ++--
 .../java/com/tangem/domain/wallet/EthEngine.java   |  5 +++--
 .../tangem/presentation/fragment/LoadedWallet.kt   |  7 +++++--
 app/src/main/res/layout/fr_loaded_wallet.xml       | 14 +++++++++++++-
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java
index 034fbc1e97..fb531e31e7 100644
--- a/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java
@@ -290,10 +290,10 @@ public class BtcCashEngine extends CoinEngine {
     }
 
     public static String getAmountEquivalentDescriptionBTC(Double amount, float rate) {
-        if (rate > 0) {
+        if ((rate > 0) && (amount > 0)) {
             return String.format("≈ USD %.2f", amount * rate);
         } else {
-            return "≈ USD  ---";
+            return "";
         }
     }
 
diff --git a/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java
index 4d4a8ba3d8..4a159d3c66 100644
--- a/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java
@@ -335,10 +335,10 @@ public class BtcEngine extends CoinEngine {
     }
 
     public static String getAmountEquivalentDescriptionBTC(Double amount, float rate) {
-        if (rate > 0) {
+        if ((rate > 0) && (amount > 0)) {
             return String.format("≈ USD %.2f", amount * rate);
         } else {
-            return "≈ USD  ---";
+            return "";
         }
     }
 
diff --git a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java
index 22e3515b24..c72b28a461 100644
--- a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java
@@ -112,7 +112,7 @@ public class EthEngine extends CoinEngine {
             exchangeCurs = exchangeCurs.setScale(2, RoundingMode.DOWN);
             return "≈ USD  " + exchangeCurs.toString();
         } else {
-            return "≈ USD  ---";
+            return "";
         }
     }
 
@@ -123,8 +123,9 @@ public class EthEngine extends CoinEngine {
         if (rate > 0) {
             return String.format("≈ USD %.2f", amount * rate);
         } else {
-            return "≈ USD  ---";
+            return "";
         }
+
     }
 
 
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index 06374ba8fc..9aa0699443 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -776,6 +776,8 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                 tvBalanceLine1.setTextColor(resources.getColor(R.color.primary))
                 tvBalanceLine1.text = getString(R.string.verifying_in_blockchain)
                 tvBalanceLine2.text = ""
+                tvBalance.text = ""
+                tvBalanceEquivalent.text = ""
             } else {
                 val validator = BalanceValidator()
                 validator.Check(card, false)
@@ -788,10 +790,11 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                 if ((card!!.blockchain == Blockchain.Token) && (engine.getBalanceWithAlter(card) != null)) {
                     val html = Html.fromHtml(engine.getBalanceWithAlter(card))
                     tvBalance.text = html
-                } else
+                } else {
 //                    tvBalance.text = engine.getBalanceWithAlter(card)
                     tvBalance.text = engine.getBalance(card)
-
+                    tvBalanceEquivalent.text = engine.getBalanceEquivalent(card)
+                }
             } else {
                 val offlineAmount = engine.convertByteArrayToAmount(card, card!!.offlineBalance)
                 if (card!!.blockchain == Blockchain.Token) {
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index c33aa6d7d4..31aad459ba 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -105,7 +105,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginBottom="10dp"
+                        android:layout_marginBottom="5dp"
                         android:gravity="center_vertical"
                         android:orientation="horizontal">
 
@@ -122,6 +122,18 @@
 
                     </LinearLayout>
 
+                    <TextView
+                        android:id="@+id/tvBalanceEquivalent"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
+                        android:fontFamily="@font/maax"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:textAlignment="center"
+                        android:textColor="@color/primary"
+                        android:textSize="@dimen/text_size_2_small" />
+
                     <TextView
                         android:id="@+id/tvBalanceLine1"
                         android:layout_width="match_parent"