GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2018-10-19 13:34:18 +03:00
parent e1999ed34f
commit 2ba21aab5c
5 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java
View file

@ -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 "";
}
}

4
app/src/main/java/com/tangem/domain/wallet/BtcEngine.java
View file

@ -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 "";
}
}

5
app/src/main/java/com/tangem/domain/wallet/EthEngine.java
View file

@ -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 "";
}
}

7
app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
View file

@ -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) {

14
app/src/main/res/layout/fr_loaded_wallet.xml
View file

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