Merge pull request #5620

6715efb [Qt] Payment request expiration bug fix (re-done) (Philip Kaufmann)
This commit is contained in:
Wladimir J. van der Laan
2015-01-29 12:47:13 +01:00
7 changed files with 137 additions and 13 deletions

View File

@@ -529,6 +529,10 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
case WalletModel::InsaneFee:
msgParams.first = tr("A fee higher than %1 is considered an insanely high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), 10000000));
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: