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 ff6473e56d..fb03157adc 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
@@ -46,20 +46,22 @@ public class ETHRequestTask extends InfuraTask {
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));
+ String MinFeeInGwei = confirmPaymentActivity.getCard().getAmountInGwei(String.valueOf(l));
+ String NormalFeeInGwei = confirmPaymentActivity.getCard().getAmountInGwei(String.valueOf(l.multiply(BigInteger.valueOf(12)).divide(BigInteger.valueOf(10))));
+ String MaxFeeInGwei = confirmPaymentActivity.getCard().getAmountInGwei(String.valueOf(l.multiply(BigInteger.valueOf(15)).divide(BigInteger.valueOf(10))));
- Log.i("sjjoefeff", feeInGwei);
+ Log.i("sjjoefeff", MinFeeInGwei);
- confirmPaymentActivity.setMinFee(feeInGwei);
- confirmPaymentActivity.setMaxFee(feeInGwei);
- confirmPaymentActivity.setNormalFee(feeInGwei);
- confirmPaymentActivity.getEtFee().setText(feeInGwei);
+ confirmPaymentActivity.setMinFee(MinFeeInGwei);
+ confirmPaymentActivity.setNormalFee(NormalFeeInGwei);
+ confirmPaymentActivity.setMaxFee(MaxFeeInGwei);
+ confirmPaymentActivity.getEtFee().setText(NormalFeeInGwei);
confirmPaymentActivity.getEtFee().setError(null);
confirmPaymentActivity.getBtnSend().setVisibility(View.VISIBLE);
confirmPaymentActivity.setFeeRequestSuccess(true);
confirmPaymentActivity.setBalanceRequestSuccess(true);
confirmPaymentActivity.setDtVerified(new Date());
- confirmPaymentActivity.setMinFeeInInternalUnits(confirmPaymentActivity.getCard().internalUnitsFromString(feeInGwei));
+ confirmPaymentActivity.setMinFeeInInternalUnits(confirmPaymentActivity.getCard().internalUnitsFromString(NormalFeeInGwei));
} catch (JSONException e) {
e.printStackTrace();
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 b34a6036a6..e2b3e67e37 100644
--- a/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/ConfirmPaymentActivity.kt
@@ -17,10 +17,8 @@ import android.widget.*
import com.tangem.data.network.ServerApiHelper
import com.tangem.data.network.request.ElectrumRequest
import com.tangem.data.network.request.FeeRequest
-import com.tangem.data.network.request.InfuraRequest
import com.tangem.data.network.task.confirm_payment.ConnectFeeTask
import com.tangem.data.network.task.confirm_payment.ConnectTask
-import com.tangem.data.network.task.confirm_payment.ETHRequestTask
import com.tangem.domain.cardReader.NfcManager
import com.tangem.domain.wallet.*
import com.tangem.util.BTCUtils
@@ -83,10 +81,10 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
} else
tvBalance.text = engine!!.getBalanceWithAlter(card)
- if(intent.getBooleanExtra("IncFee", true)) {
- tvIncFee!!.setText(R.string.feein);
+ if (intent.getBooleanExtra("IncFee", true)) {
+ tvIncFee!!.setText(R.string.including_fee)
} else {
- tvIncFee!!.setText(R.string.feeout);
+ tvIncFee!!.setText(R.string.not_including_fee)
}
etAmount!!.setText(intent.getStringExtra(SignPaymentActivity.EXTRA_AMOUNT))
@@ -221,20 +219,23 @@ class ConfirmPaymentActivity : AppCompatActivity(), NfcAdapter.ReaderCallback {
var gasPrice = it.result
gasPrice = gasPrice.substring(2)
var l = BigInteger(gasPrice, 16)
+
val m = if (card!!.blockchain == Blockchain.Token) BigInteger.valueOf(55000) else BigInteger.valueOf(21000)
l = l.multiply(m)
- val feeInGwei = card!!.getAmountInGwei(l.toString())
+ val minFeeInGwei = card!!.getAmountInGwei(l.toString())
+ val normalFeeInGwei = card!!.getAmountInGwei(l.multiply(BigInteger.valueOf(12)).divide(BigInteger.valueOf(10)).toString())
+ val maxFeeInGwei = card!!.getAmountInGwei(l.multiply(BigInteger.valueOf(15)).divide(BigInteger.valueOf(10)).toString())
- minFee = feeInGwei
- maxFee = feeInGwei
- normalFee = feeInGwei
- etFee!!.setText(feeInGwei)
+ minFee = minFeeInGwei
+ normalFee = normalFeeInGwei
+ maxFee = maxFeeInGwei
+ etFee!!.setText(normalFeeInGwei)
etFee!!.error = null
btnSend!!.visibility = View.VISIBLE
feeRequestSuccess = true
balanceRequestSuccess = true
dtVerified = Date()
- minFeeInInternalUnits = card!!.internalUnitsFromString(feeInGwei)
+ minFeeInInternalUnits = card!!.internalUnitsFromString(normalFeeInGwei)
// Log.i("eth_gas_price", feeInGwei)
}
diff --git a/app/src/main/res/layout/activity_confirm_payment.xml b/app/src/main/res/layout/activity_confirm_payment.xml
index fbafce3753..19deb73508 100644
--- a/app/src/main/res/layout/activity_confirm_payment.xml
+++ b/app/src/main/res/layout/activity_confirm_payment.xml
@@ -134,11 +134,11 @@
android:layout_height="wrap_content"
android:layout_marginBottom="1dp"
android:fontFamily="@font/maax"
- android:text="@string/including_fee"
android:textColor="@color/primary"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@+id/textView3"
- app:layout_constraintLeft_toRightOf="@+id/textView3" />
+ app:layout_constraintLeft_toRightOf="@+id/textView3"
+ tools:text="(including fee)" />
diff --git a/app/src/main/res/layout/activity_prepare_payment.xml b/app/src/main/res/layout/activity_prepare_payment.xml
index d96c411a1f..784c45d9c0 100644
--- a/app/src/main/res/layout/activity_prepare_payment.xml
+++ b/app/src/main/res/layout/activity_prepare_payment.xml
@@ -228,7 +228,7 @@
android:layout_width="150dp"
android:layout_height="wrap_content"
android:fontFamily="@font/saira_condensed_bold"
- android:text="@string/feein"
+ android:text="@string/including_fee_"
android:textSize="@dimen/text_size_medium" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9916fdef5e..22bb06168f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,7 +39,7 @@
with balance
Send to wallet
Amount
- (including fee)
+
mBTC
Scan again to verify the card
Smart Cash AG
@@ -164,8 +164,10 @@
Minimal
Normal
Priority
- Including fee
- Not including fee
+ Including fee
+ Not including fee
+ (including fee)
+ (not including fee)
The obtained data is outdated! Try again
Cannot reach current active blockchain node. Try again
Cannot check balance! No connection with blockchain nodes