diff --git a/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java b/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java index ec59f1af4f..ed37399ac2 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/BtcCashEngine.java @@ -212,7 +212,7 @@ public class BtcCashEngine extends CoinEngine { if (fee.isZero() || amount.isZero()) return false; - if (isIncludeFee && amount.compareTo(coinData.getBalanceInInternalUnits()) > 0) + if (isIncludeFee && (amount.compareTo(coinData.getBalanceInInternalUnits()) > 0 || amount.compareTo(fee)<0)) return false; if (!isIncludeFee && amount.add(fee).compareTo(coinData.getBalanceInInternalUnits()) > 0) diff --git a/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java b/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java index 92cc1b11e7..80f413312b 100644 --- a/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/BtcEngine.java @@ -215,7 +215,7 @@ public class BtcEngine extends CoinEngine { if (fee.isZero() || amount.isZero()) return false; - if (isIncludeFee && amount.compareTo(coinData.getBalanceInInternalUnits())>0) + if (isIncludeFee && (amount.compareTo(coinData.getBalanceInInternalUnits())>0 || amount.compareTo(fee)<0)) return false; if (!isIncludeFee && amount.add(fee).compareTo(coinData.getBalanceInInternalUnits())>0) diff --git a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java index e34d59c0da..fdfea0f9e7 100644 --- a/app/src/main/java/com/tangem/domain/wallet/EthEngine.java +++ b/app/src/main/java/com/tangem/domain/wallet/EthEngine.java @@ -284,7 +284,7 @@ public class EthEngine extends CoinEngine { try { BigDecimal cardBalance = getBalance(); - if (isFeeIncluded && amount.compareTo(cardBalance) > 0 ) + if (isFeeIncluded && (amount.compareTo(cardBalance) > 0 || amount.compareTo(fee)<0)) return false; if (!isFeeIncluded && amount.add(fee).compareTo(cardBalance) > 0) diff --git a/app/src/main/res/layout/activity_confirm_payment.xml b/app/src/main/res/layout/activity_confirm_payment.xml index a662374ce8..35e7f5ed61 100644 --- a/app/src/main/res/layout/activity_confirm_payment.xml +++ b/app/src/main/res/layout/activity_confirm_payment.xml @@ -108,6 +108,7 @@ android:inputType="text" android:maxLines="2" android:padding="12dp" + android:singleLine="false" android:textColor="@color/black" android:textSize="@dimen/text_size_1_small" android:textStyle="bold" />