From e0e92d84d7c015a39c3bc1e1ab7ae5b1e21546b2 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 11 Sep 2018 13:52:53 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/build.gradle                              |  2 +-
 .../presentation/fragment/LoadedWallet.kt     | 39 +++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0c79645200..9c5915f2b2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 75
+        versionCode 76
         versionName "0.88.1." + generateVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
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 11a17fe48a..638c5d17ae 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -148,7 +148,6 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                             } catch (e: ActivityNotFoundException) {
                                 showSingleToast(R.string.no_compatible_wallet)
                             }
-
                         }
 //                        getString(R.string.via_cryptonit2) -> {
 //                            val intent = Intent(context, PrepareCryptonitOtherAPIWithdrawalActivity::class.java)
@@ -263,22 +262,29 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
                     }
 
                     ServerApiHelper.INFURA_ETH_CALL -> {
-                        var balanceCap = infuraResponse.result
-                        balanceCap = balanceCap.substring(2)
-                        val l = BigInteger(balanceCap, 16)
-                        val balance = l.toLong()
-                        if (l.compareTo(BigInteger.ZERO) == 0) {
-                            card!!.blockchainID = Blockchain.Ethereum.id
-                            card!!.addTokenToBlockchainName()
-                            srlLoadedWallet!!.isRefreshing = false
+                        try {
+                            var balanceCap = infuraResponse.result
+                            balanceCap = balanceCap.substring(2)
+                            val l = BigInteger(balanceCap, 16)
+                            val balance = l.toLong()
+                            if (l.compareTo(BigInteger.ZERO) == 0) {
+                                card!!.blockchainID = Blockchain.Ethereum.id
+                                card!!.addTokenToBlockchainName()
+                                srlLoadedWallet!!.isRefreshing = false
 //                            refresh()
-                            return@onInfuraSuccess
-                        }
-                        card!!.setBalanceConfirmed(balance)
-                        card!!.balanceUnconfirmed = 0L
-                        card!!.decimalBalance = l.toString(10)
+                                return@onInfuraSuccess
+                            }
+                            card!!.setBalanceConfirmed(balance)
+                            card!!.balanceUnconfirmed = 0L
+                            card!!.decimalBalance = l.toString(10)
 
-                        Log.i("$TAG eth_call", balanceCap)
+                            Log.i("$TAG eth_call", balanceCap)
+
+                        } catch (e: JSONException) {
+                            e.printStackTrace()
+                        } catch (e: NumberFormatException) {
+                            e.printStackTrace()
+                        }
                     }
 
                     ServerApiHelper.INFURA_ETH_SEND_RAW_TRANSACTION -> {
@@ -779,9 +785,10 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
 //
 //            updateETH.execute(reqETH, reqNonce, reqBalance)
 
+            requestInfura(ServerApiHelper.INFURA_ETH_CALL, engine.getContractAddress(card))
             requestInfura(ServerApiHelper.INFURA_ETH_GET_BALANCE, "")
             requestInfura(ServerApiHelper.INFURA_ETH_GET_TRANSACTION_COUNT, "")
-            requestInfura(ServerApiHelper.INFURA_ETH_CALL, engine.getContractAddress(card))
+
 
             requestRateInfo("ethereum")
         }