From c439e633376dc71c790fcf961b11c7c4d097a7ea Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 19 Oct 2018 12:04:02 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/build.gradle                              |  2 +-
 .../activity/SendTransactionActivity.kt       | 22 ++++++-------------
 app/src/main/res/layout/fr_loaded_wallet.xml  | 10 ++++-----
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f31658ccf5..615c37305f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 92
+        versionCode 93
         versionName "0.89.2." + 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 284f0a7d82..35dfcbfe9a 100644
--- a/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/SendTransactionActivity.kt
@@ -48,18 +48,13 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         tx = intent.getStringExtra(EXTRA_TX)
 
         val engine = CoinEngineFactory.create(card!!.blockchain)
-        if (card!!.blockchain == Blockchain.Ethereum || card!!.blockchain == Blockchain.EthereumTestNet || card!!.blockchain == Blockchain.Token) {
 
+        if (card!!.blockchain == Blockchain.Ethereum || card!!.blockchain == Blockchain.EthereumTestNet || card!!.blockchain == Blockchain.Token)
             requestInfura(ServerApiHelper.INFURA_ETH_SEND_RAW_TRANSACTION, "")
-
-        } else if (card!!.blockchain == Blockchain.Bitcoin || card!!.blockchain == Blockchain.BitcoinTestNet) {
-
+        else if (card!!.blockchain == Blockchain.Bitcoin || card!!.blockchain == Blockchain.BitcoinTestNet)
             requestElectrum(card!!, ElectrumRequest.broadcast(card!!.wallet, tx))
-
-        } else if (card!!.blockchain == Blockchain.BitcoinCash || card!!.blockchain == Blockchain.BitcoinCashTestNet) {
-
+        else if (card!!.blockchain == Blockchain.BitcoinCash || card!!.blockchain == Blockchain.BitcoinCashTestNet)
             requestElectrum(card!!, ElectrumRequest.broadcast(card!!.wallet, tx))
-        }
 
         // request electrum listener
         val electrumBodyListener: ServerApiHelperElectrum.ElectrumRequestDataListener = object : ServerApiHelperElectrum.ElectrumRequestDataListener {
@@ -74,12 +69,10 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
                             finishWithSuccess()
                         } catch (e: Exception) {
                             e.printStackTrace()
-                            finishWithError(hashTX)
                             requestElectrum(card!!, ElectrumRequest.broadcast(card!!.wallet, tx))
                         }
                     } catch (e: JSONException) {
                         e.printStackTrace()
-                        finishWithError(e.toString())
                         requestElectrum(card!!, ElectrumRequest.broadcast(card!!.wallet, tx))
                     }
                 }
@@ -89,10 +82,9 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
                 finishWithError(message!!)
             }
         }
-
         serverApiHelperElectrum.setElectrumRequestData(electrumBodyListener)
 
-        // request eth sendRawTransaction
+        // request infura listener
         val infuraBodyListener: ServerApiHelper.InfuraBodyListener = object : ServerApiHelper.InfuraBodyListener {
             override fun onSuccess(method: String, infuraResponse: InfuraResponse) {
                 when (method) {
@@ -103,7 +95,8 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
                                 val tmp = infuraResponse.result
                                 hashTX = tmp
                             } catch (e: JSONException) {
-                                finishWithError(e.message!!)
+                                e.printStackTrace()
+                                requestInfura(ServerApiHelper.INFURA_ETH_SEND_RAW_TRANSACTION, "")
                                 return
                             }
 
@@ -118,7 +111,7 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
                             finishWithSuccess()
                         } catch (e: Exception) {
                             e.printStackTrace()
-                            finishWithError(e.message!!)
+                            requestInfura(ServerApiHelper.INFURA_ETH_SEND_RAW_TRANSACTION, "")
                         }
                     }
                 }
@@ -132,7 +125,6 @@ class SendTransactionActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
                 }
             }
         }
-
         serverApiHelper.setInfuraResponse(infuraBodyListener)
     }
 
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index c33aa6d7d4..4c9ed825d2 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -22,7 +22,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="1.0">
 
-        <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentBottom="false"
@@ -268,8 +268,8 @@
             android:id="@+id/tvError"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="false"
             android:layout_below="@+id/tvMessage"
+            android:layout_alignParentBottom="false"
             android:background="@color/msg_err"
             android:elevation="3dp"
             android:fontFamily="@font/maax"
@@ -336,8 +336,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingBottom="10dp"
         android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         app:layout_constraintBottom_toBottomOf="parent">
 
         <android.support.v7.widget.AppCompatButton
@@ -345,8 +345,8 @@
             style="@style/AppTheme.RoundedCornerMaterialButton"
             android:layout_width="0dp"
             android:layout_height="34dp"
-            android:layout_marginBottom="5dp"
             android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
             android:layout_weight="1"
             android:backgroundTint="@color/white"
             android:drawableStart="@drawable/ic_settings_black_24dp"
@@ -362,8 +362,8 @@
             style="@style/AppTheme.RoundedCornerMaterialButton"
             android:layout_width="0dp"
             android:layout_height="34dp"
-            android:layout_marginBottom="5dp"
             android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
             android:layout_weight="1"
             android:backgroundTint="@color/white"
             android:drawableStart="@drawable/ic_nfc_white_24dp"