From 1da1c903a168e69d405002c5442e32cb09742856 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 4 Sep 2018 14:01:04 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/build.gradle                               |  2 +-
 .../com/tangem/domain/wallet/EthEngine.java    |  8 ++++----
 .../activity/ConfirmPaymentActivity.kt         | 18 ++++++++++--------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6f8c26ba7a..e8f30c1e9c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 68
+        versionCode 69
         versionName "0.88.1." + generateVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
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 65a5499824..146073ba6b 100644
--- a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java
@@ -194,9 +194,9 @@ public class EthEngine extends CoinEngine {
         throw new Exception("Not implemented");
     }
 
-    public String getAmountEquivalentDescriptor(TangemCard mCard, String value) {
+    public String getAmountEquivalentDescriptor(TangemCard card, String value) {
         BigDecimal d = new BigDecimal(value);
-        return getAmountEquivalentDescriptionETH(d, mCard.getRate());
+        return getAmountEquivalentDescriptionETH(d, card.getRate());
     }
 
     public BigDecimal GetBalanceAlterValueBigDecimal(TangemCard mCard) {
@@ -276,11 +276,11 @@ public class EthEngine extends CoinEngine {
         return true;
     }
 
-    public String evaluateFeeEquivalent(TangemCard mCard, String fee) {
+    public String evaluateFeeEquivalent(TangemCard card, String fee) {
         BigDecimal gweFee = new BigDecimal(fee);
         gweFee = gweFee.divide(new BigDecimal("1000000000"));
         gweFee = gweFee.setScale(18, RoundingMode.DOWN);
-        return getAmountEquivalentDescriptor(mCard, gweFee.toString());
+        return getAmountEquivalentDescriptor(card, gweFee.toString());
     }
 
     public String calculateAddress(TangemCard mCard, byte[] pkUncompressed) throws NoSuchProviderException, NoSuchAlgorithmException {
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 56315b47d8..072bba8755 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
@@ -42,7 +42,6 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
     var card: TangemCard? = null
     var feeRequestSuccess = false
     var balanceRequestSuccess = false
-    private var tvFeeEquivalent: TextView? = null
     var etAmount: EditText? = null
     var etFee: EditText? = null
     var rgFee: RadioGroup? = null
@@ -73,7 +72,6 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         btnSend = findViewById(R.id.btnSend)
         etAmount = findViewById(R.id.etAmount)
         etFee = findViewById(R.id.etFee)
-        tvFeeEquivalent = findViewById(R.id.tvFeeEquivalent)
         rgFee = findViewById(R.id.rgFee)
 
         val engine = CoinEngineFactory.create(card!!.blockchain)
@@ -144,16 +142,20 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
                 try {
                     val engine = CoinEngineFactory.create(card!!.blockchain)
                     val eqFee = engine!!.evaluateFeeEquivalent(card, etFee!!.text.toString())
-                    tvFeeEquivalent!!.text = eqFee
+                    tvFeeEquivalent.text = eqFee
 
                     if (!card!!.amountEquivalentDescriptionAvailable) {
-                        tvFeeEquivalent!!.error = "Service unavailable"
-                    } else {
-                        tvFeeEquivalent!!.error = null
-                    }
+                        tvFeeEquivalent.error = "Service unavailable"
+                        tvCurrency2.visibility = View.GONE
+                        tvFeeEquivalent.visibility = View.GONE
+                    } else
+                        tvFeeEquivalent.error = null
+
                 } catch (e: Exception) {
                     e.printStackTrace()
-                    tvFeeEquivalent!!.text = ""
+                    tvFeeEquivalent.text = ""
+                    tvCurrency2.visibility = View.GONE
+                    tvFeeEquivalent.visibility = View.GONE
                 }
             }