mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-11 14:38:29 +01:00
Merge #9481: [Qt] Show more significant warning if we fall back to the default fee
7abe7bbQt/Send: Give fallback fee a reasonable indent (Luke Dashjr)3e4d7bfQt/Send: Figure a decent warning colour from theme (Luke Dashjr)c5adf8f[Qt] Show more significant warning if we fall back to the default fee (Jonas Schnelli) Tree-SHA512: 9e85b5b398d7a49aaf6c42578d63750b1b7aa9cc9e84d008fe21d6c53f1ffe2fb69286a1a764e634ebca3286564615578eea0a1bc883e4b332be8306d9883d14
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
#include "txmempool.h"
|
||||
#include "wallet/wallet.h"
|
||||
|
||||
#include <QFontMetrics>
|
||||
#include <QMessageBox>
|
||||
#include <QScrollBar>
|
||||
#include <QSettings>
|
||||
@@ -656,6 +657,11 @@ void SendCoinsDialog::updateSmartFeeLabel()
|
||||
std::max(CWallet::fallbackFee.GetFeePerK(), CWallet::GetRequiredFee(1000))) + "/kB");
|
||||
ui->labelSmartFee2->show(); // (Smart fee not initialized yet. This usually takes a few blocks...)
|
||||
ui->labelFeeEstimation->setText("");
|
||||
ui->fallbackFeeWarningLabel->setVisible(true);
|
||||
int lightness = ui->fallbackFeeWarningLabel->palette().color(QPalette::WindowText).lightness();
|
||||
QColor warning_colour(255 - (lightness / 5), 176 - (lightness / 3), 48 - (lightness / 14));
|
||||
ui->fallbackFeeWarningLabel->setStyleSheet("QLabel { color: " + warning_colour.name() + "; }");
|
||||
ui->fallbackFeeWarningLabel->setIndent(QFontMetrics(ui->fallbackFeeWarningLabel->font()).width("x"));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -663,6 +669,7 @@ void SendCoinsDialog::updateSmartFeeLabel()
|
||||
std::max(feeRate.GetFeePerK(), CWallet::GetRequiredFee(1000))) + "/kB");
|
||||
ui->labelSmartFee2->hide();
|
||||
ui->labelFeeEstimation->setText(tr("Estimated to begin confirmation within %n block(s).", "", estimateFoundAtBlocks));
|
||||
ui->fallbackFeeWarningLabel->setVisible(false);
|
||||
}
|
||||
|
||||
updateFeeMinimizedLabel();
|
||||
|
||||
Reference in New Issue
Block a user