From 180e2b9c4e2d7f44ebc691b5fb539cf87bee8c8e Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 8 Nov 2018 12:45:58 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/build.gradle                              |  2 +-
 .../activity/SendTransactionActivity.kt       | 22 +++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 728a744d67..f18aa3510b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 97
+        versionCode 98
         versionName "0.810.1." + generateVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
index 69ba91f531..08754389e5 100644
--- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
@@ -40,7 +40,6 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
 
         nfcManager = NfcManager(this, this)
 
-
         ctx = TangemContext.loadFromBundle(this, intent.extras)
         tx = intent.getStringExtra(EXTRA_TX)
 
@@ -57,14 +56,10 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         val electrumBodyListener: ServerApiHelperElectrum.ElectrumRequestDataListener = object : ServerApiHelperElectrum.ElectrumRequestDataListener {
             override fun onSuccess(electrumRequest: ElectrumRequest?) {
                 if (electrumRequest!!.isMethod(ElectrumRequest.METHOD_SendTransaction)) {
-                    try {
-                        if (electrumRequest.resultString.isEmpty())
-                            finishWithError("Rejected by node: " + electrumRequest.getError())
-
+                    if (electrumRequest.resultString.isEmpty())
+                        finishWithError("Rejected by node: " + electrumRequest.getError())
+                    else
                         finishWithSuccess()
-                    } catch (e: JSONException) {
-                        e.printStackTrace()
-                    }
                 }
             }
 
@@ -79,18 +74,13 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
             override fun onSuccess(method: String, infuraResponse: InfuraResponse) {
                 when (method) {
                     ServerApiHelper.INFURA_ETH_SEND_RAW_TRANSACTION -> {
-                        try {
-                            //infuraResponse.result - it's HashTX
-                            if (infuraResponse.result.isEmpty())
-                                finishWithError("Rejected by node: " + infuraResponse.error)
-
+                        if (infuraResponse.result.isEmpty())
+                            finishWithError("Rejected by node: " + infuraResponse.error)
+                        else {
                             val nonce = (ctx.coinData!! as EthData).confirmedTXCount
                             nonce.add(BigInteger.valueOf(1))
                             (ctx.coinData!! as EthData).confirmedTXCount = nonce
-
                             finishWithSuccess()
-                        } catch (e: Exception) {
-                            e.printStackTrace()
                         }
                     }
                 }