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 a14b0e9c0e..f593c0e6be 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -754,6 +754,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)
@@ -766,10 +768,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 4c9ed825d2..d3809c65fe 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 @@
@@ -122,6 +122,18 @@
+
+