diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index c475c6b73e9..90e46c79815 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -742,9 +742,6 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn case WalletModel::AmountExceedsBalance: msgParams.first = tr("The amount exceeds your balance."); break; - case WalletModel::AmountWithFeeExceedsBalance: - msgParams.first = tr("The total exceeds your balance when the %1 transaction fee is included.").arg(msgArg); - break; case WalletModel::DuplicateAddress: msgParams.first = tr("Duplicate address found: addresses should only be used once each."); break; diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index 578713c0abc..2880c6e7381 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -209,12 +209,7 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact if (fSubtractFeeFromAmount && newTx) transaction.reassignAmounts(nChangePosRet); - if(!newTx) - { - if(!fSubtractFeeFromAmount && (total + nFeeRequired) > nBalance) - { - return SendCoinsReturn(AmountWithFeeExceedsBalance); - } + if (!newTx) { Q_EMIT message(tr("Send Coins"), QString::fromStdString(util::ErrorString(res).translated), CClientUIInterface::MSG_ERROR); return TransactionCreationFailed; diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h index c4abde8ba39..ced057574b8 100644 --- a/src/qt/walletmodel.h +++ b/src/qt/walletmodel.h @@ -59,7 +59,6 @@ public: InvalidAmount, InvalidAddress, AmountExceedsBalance, - AmountWithFeeExceedsBalance, DuplicateAddress, TransactionCreationFailed, // Error returned when wallet is still locked AbsurdFee