GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge b9ef5a10e2 into merged_master (Bitcoin PR bitcoin-core/gui#609)

Browse source
This commit is contained in:
James Dorfman 2024-09-06 18:10:18 +00:00
commit 8aebedf3b9
2 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/qt/sendcoinsdialog.cpp
View file

@ -770,10 +770,6 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
case WalletModel::AbsurdFee:
msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->wallet().getDefaultMaxTxFee()));
break;
case WalletModel::PaymentRequestExpired:
msgParams.first = tr("Payment request expired.");
msgParams.second = CClientUIInterface::MSG_ERROR;
break;
// included to prevent a compiler warning.
case WalletModel::OK:
default:

3
src/qt/walletmodel.h
View file

@ -67,8 +67,7 @@ public:
AmountWithFeeExceedsBalance,
DuplicateAddress,
TransactionCreationFailed, // Error returned when wallet is still locked
AbsurdFee,
PaymentRequestExpired
AbsurdFee
};
enum EncryptionStatus