diff --git a/app/build.gradle b/app/build.gradle index 6ced38debd..6f8c26ba7a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,7 @@ android { applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 65 + versionCode 68 versionName "0.88.1." + generateVersionName() testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/tangem/data/network/task/confirm_payment/ETHRequestTask.java b/app/src/main/java/com/tangem/data/network/task/confirm_payment/ETHRequestTask.java index 39e4300200..a3772a1fd9 100644 --- a/app/src/main/java/com/tangem/data/network/task/confirm_payment/ETHRequestTask.java +++ b/app/src/main/java/com/tangem/data/network/task/confirm_payment/ETHRequestTask.java @@ -1,6 +1,7 @@ package com.tangem.data.network.task.confirm_payment; import android.app.Activity; +import android.util.Log; import android.view.View; import com.tangem.data.network.request.InfuraRequest; @@ -36,13 +37,19 @@ public class ETHRequestTask extends InfuraTask { if (request.isMethod(InfuraRequest.METHOD_ETH_GetGasPrice)) { try { String gasPrice = request.getResultString(); + Log.i("sjjoefeff", gasPrice); gasPrice = gasPrice.substring(2); BigInteger l = new BigInteger(gasPrice, 16); + + Log.i("sjjoefeff", gasPrice); + BigInteger m = confirmPaymentActivity.getCard().getBlockchain() == Blockchain.Token ? BigInteger.valueOf(55000) : BigInteger.valueOf(21000); l = l.multiply(m); String feeInGwei = confirmPaymentActivity.getCard().getAmountInGwei(String.valueOf(l)); + Log.i("sjjoefeff", feeInGwei); + confirmPaymentActivity.setMinFee(feeInGwei); confirmPaymentActivity.setMaxFee(feeInGwei); confirmPaymentActivity.setNormalFee(feeInGwei); 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 d8261adfcd..70dcaa3da2 100644 --- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt +++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt @@ -86,7 +86,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { etAmount!!.setText(intent.getStringExtra(SignPaymentActivity.EXTRA_AMOUNT)) tvCurrency.text = engine.getBalanceCurrency(card) - tvCurrency2.text = engine.getFeeCurrency() + tvCurrency2.text = engine.feeCurrency tvCardID.text = card!!.cidDescription @@ -137,7 +137,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { val engineCoin = CoinEngineFactory.create(card!!.blockchain) - if (engineCoin!!.isNeedCheckNode() && !nodeCheck) { + if (engineCoin!!.isNeedCheckNode && !nodeCheck) { Toast.makeText(baseContext, getString(R.string.cannot_reach_current_active_blockchain_node_try_again), Toast.LENGTH_LONG).show() return@setOnClickListener } @@ -159,7 +159,7 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback { } if (!engineCoin.checkAmountValue(card, txAmount, txFee, minFeeInInternalUnits)) { - finishActivityWithError(Activity.RESULT_CANCELED, getString(R.string.fee_exceeds_payment_amount_enter_correct_value_and_repeat_sending)) + finishActivityWithError(Activity.RESULT_CANCELED, getString(R.string.not_enough_eth_for_transaction_fee)) return@setOnClickListener } 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 e510e0600a..799a71587a 100644 --- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt +++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt @@ -173,7 +173,7 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific } } - serverApiHelper!!.infura("eth_gasPrice", 67) +// serverApiHelper!!.infura("eth_gasPrice", 67) // request card verify listener serverApiHelper!!.setCardVerify { diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml index 631014887d..e72d8b66e3 100644 --- a/app/src/main/res/layout/fr_loaded_wallet.xml +++ b/app/src/main/res/layout/fr_loaded_wallet.xml @@ -115,6 +115,7 @@ Cannot check balance! No connection with blockchain nodes The wallet is empty Please wait for confirmation of incoming transaction - Fee exceeds payment amount. Enter correct value and repeat sending. + Not enough ETH for transaction fee PIN2 is required to sign the payment