From 477ca0d1a6bd5a43bf287ce231fa211e0ce446be Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 11 Sep 2018 10:22:24 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../tangem/presentation/activity/ConfirmPaymentActivity.kt | 6 ++++++ app/src/main/java/com/tangem/util/BTCUtils.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt index f3cb1e046d..612998fa07 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt @@ -89,6 +89,12 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { tvIncFee!!.setText(R.string.not_including_fee) } + if (card!!.blockchain == Blockchain.Token) { + tvIncFee!!.visibility = View.INVISIBLE + } else { + tvIncFee!!.visibility = View.VISIBLE + } + etAmount!!.setText(intent.getStringExtra(SignPaymentActivity.EXTRA_AMOUNT)) tvCurrency.text = engine.getBalanceCurrency(card) tvCurrency2.text = engine.feeCurrency diff --git a/app/src/main/java/com/tangem/util/BTCUtils.java b/app/src/main/java/com/tangem/util/BTCUtils.java index 12988570a6..2ffecbd159 100644 --- a/app/src/main/java/com/tangem/util/BTCUtils.java +++ b/app/src/main/java/com/tangem/util/BTCUtils.java @@ -114,7 +114,7 @@ public final class BTCUtils { String pattern = "#0.00000000"; DecimalFormat myFormatter = new DecimalFormat(pattern); - String output = myFormatter.format(dec); + String output = myFormatter.format(dec).replace(",","."); return output; }