From 3fb5f4758338eda7581aff5d9b5d7efda8a7102a Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 29 Aug 2018 21:14:24 +0300
Subject: [PATCH] Updated on 2026-08-14

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

diff --git a/app/build.gradle b/app/build.gradle
index 5923e66c6f..c53f76505a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 62
+        versionCode 63
         versionName "0.88.1." + generateVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt
index 0a7ad936d1..fcce6c2aa3 100644
--- a/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/PreparePaymentActivity.kt
@@ -9,6 +9,7 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.text.Html
 import android.text.InputFilter
+import android.util.Log
 import android.widget.Toast
 import com.tangem.domain.cardReader.NfcManager
 import com.tangem.domain.wallet.Blockchain
@@ -57,26 +58,33 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
         if (card!!.remainingSignatures < 2)
             etAmount.isEnabled = false
 
+        // Ethereum EthereumTestNet
         if (card!!.blockchain == Blockchain.Ethereum || card!!.blockchain == Blockchain.EthereumTestNet) {
             tvCurrency.text = engine.getBalanceCurrency(card)
             useCurrency = false
             etAmount.setText(engine.getBalanceValue(card))
+        }
 
-        } else if (card!!.blockchain == Blockchain.Bitcoin || card!!.blockchain == Blockchain.BitcoinTestNet) {
+        // Bitcoin BitcoinTestNet
+        else if (card!!.blockchain == Blockchain.Bitcoin || card!!.blockchain == Blockchain.BitcoinTestNet) {
             val balance = engine.getBalanceLong(card)!! / (card!!.blockchain.multiplier / 1000.0)
             tvCurrency.text = "m" + card!!.blockchain.currency
             useCurrency = true
             val output = FormatUtil.DoubleToString(balance)
             etAmount.setText(output)
+        }
 
-        } else if (card!!.blockchain == Blockchain.BitcoinCash || card!!.blockchain == Blockchain.BitcoinCashTestNet) {
+        // BitcoinCash BitcoinCashTestNet
+        else if (card!!.blockchain == Blockchain.BitcoinCash || card!!.blockchain == Blockchain.BitcoinCashTestNet) {
             val balance = engine.getBalanceLong(card)!! / (card!!.blockchain.multiplier / 1000.0)
             tvCurrency.text = "m" + card!!.blockchain.currency
             useCurrency = true
             val output = FormatUtil.DoubleToString(balance)
             etAmount.setText(output)
+        }
 
-        } else {
+        // Default
+        else {
             tvCurrency.text = engine.getBalanceCurrency(card)
             useCurrency = false
             etAmount.setText(engine.getBalanceValue(card))
@@ -108,6 +116,7 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
             if (engine1 != null)
                 checkAddress = engine1.validateAddress(etWallet.text.toString(), card)
 
+            // check wallet address
             if (!checkAddress) {
                 etWallet.error = getString(R.string.incorrect_destination_wallet_address)
                 return@setOnClickListener
@@ -118,8 +127,8 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
                 return@setOnClickListener
             }
 
-            val balance = engine.getBalanceLong(card)!! / (card!!.blockchain.multiplier / 1000.0)
-            if (etAmount.text.toString().replace(",", ".").toDouble() > balance) {
+            // check enough funds
+            if (etAmount.text.toString().replace(",", ".").toDouble() > engine.getBalanceValue(card).replace(",", ".").toDouble()) {
                 etAmount.error = getString(R.string.not_enough_funds_on_your_card)
                 return@setOnClickListener
             }
@@ -131,6 +140,7 @@ class PreparePaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
             intent.putExtra(SignPaymentActivity.EXTRA_AMOUNT, strAmount)
             startActivityForResult(intent, REQUEST_CODE_SEND_PAYMENT)
         }
+
         ivCamera.setOnClickListener {
             val intent = Intent(baseContext, QrScanActivity::class.java)
             startActivityForResult(intent, REQUEST_CODE_SCAN_QR)
diff --git a/build.gradle b/build.gradle
index 6eb4b05de7..9839479c0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.60'
+    ext.kotlin_version = '1.2.61'
     repositories {
         google()
         jcenter()