Improve automatic transaction fee handling
This commit is contained in:
parent
101e796c8d
commit
a40e247252
2 changed files with 6 additions and 9 deletions
|
|
@ -845,13 +845,10 @@ void SendCoinsDialog::updateSmartFeeLabel()
|
||||||
ui->labelSmartFee->setText(DigiByteUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), feeRate.GetFeePerK()) + "/kvB");
|
ui->labelSmartFee->setText(DigiByteUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), feeRate.GetFeePerK()) + "/kvB");
|
||||||
|
|
||||||
if (reason == FeeReason::FALLBACK) {
|
if (reason == FeeReason::FALLBACK) {
|
||||||
ui->labelSmartFee2->show(); // (Smart fee not initialized yet. This usually takes a few blocks...)
|
ui->labelSmartFee2->show();
|
||||||
ui->labelFeeEstimation->setText("");
|
ui->labelSmartFee2->setText(tr("(Using Vexta recommended fallback fee)"));
|
||||||
ui->fallbackFeeWarningLabel->setVisible(true);
|
ui->labelFeeEstimation->setText(tr("Recommended fee is being used automatically."));
|
||||||
int lightness = ui->fallbackFeeWarningLabel->palette().color(QPalette::WindowText).lightness();
|
ui->fallbackFeeWarningLabel->setVisible(false);
|
||||||
QColor warning_colour(255 - (lightness / 5), 176 - (lightness / 3), 48 - (lightness / 14));
|
|
||||||
ui->fallbackFeeWarningLabel->setStyleSheet("QLabel { color: " + warning_colour.name() + "; }");
|
|
||||||
ui->fallbackFeeWarningLabel->setIndent(GUIUtil::TextWidth(QFontMetrics(ui->fallbackFeeWarningLabel->font()), "x"));
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -67,11 +67,11 @@ std::unique_ptr<WalletDatabase> MakeWalletDatabase(const std::string& name, cons
|
||||||
//! -paytxfee default
|
//! -paytxfee default
|
||||||
constexpr CAmount DEFAULT_PAY_TX_FEE = 0;
|
constexpr CAmount DEFAULT_PAY_TX_FEE = 0;
|
||||||
//! -fallbackfee default
|
//! -fallbackfee default
|
||||||
static const CAmount DEFAULT_FALLBACK_FEE = 0;
|
static const CAmount DEFAULT_FALLBACK_FEE = 100000;
|
||||||
//! -discardfee default
|
//! -discardfee default
|
||||||
static const CAmount DEFAULT_DISCARD_FEE = 10000;
|
static const CAmount DEFAULT_DISCARD_FEE = 10000;
|
||||||
//! -mintxfee default
|
//! -mintxfee default
|
||||||
static const CAmount DEFAULT_TRANSACTION_MINFEE = 10000000;
|
static const CAmount DEFAULT_TRANSACTION_MINFEE = 100000;
|
||||||
/**
|
/**
|
||||||
* maximum fee increase allowed to do partial spend avoidance, even for nodes with this feature disabled by default
|
* maximum fee increase allowed to do partial spend avoidance, even for nodes with this feature disabled by default
|
||||||
*
|
*
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue