Browse Source

[Qt] Show more significant warning if we fall back to the default fee

0.15
Jonas Schnelli 8 years ago
parent
commit
c5adf8f267
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
  1. 20
      src/qt/forms/sendcoinsdialog.ui
  2. 2
      src/qt/sendcoinsdialog.cpp

20
src/qt/forms/sendcoinsdialog.ui

@ -759,11 +759,31 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QLabel" name="fallbackFeeWarningLabel">
<property name="toolTip">
<string>Using the fallbackfee can result in sending a transaction that will take serval hours or days (or never) to confirm. Consider choosing your fee manually or wait until your have validated the complete chain.</string>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(255, 150, 0);
font-weight: bold;</string>
</property>
<property name="text">
<string>Warning: Fee estimation is currently not possible.</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer_4"> <spacer name="horizontalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>

2
src/qt/sendcoinsdialog.cpp

@ -655,6 +655,7 @@ void SendCoinsDialog::updateSmartFeeLabel()
std::max(CWallet::fallbackFee.GetFeePerK(), CWallet::GetRequiredFee(1000))) + "/kB"); std::max(CWallet::fallbackFee.GetFeePerK(), CWallet::GetRequiredFee(1000))) + "/kB");
ui->labelSmartFee2->show(); // (Smart fee not initialized yet. This usually takes a few blocks...) ui->labelSmartFee2->show(); // (Smart fee not initialized yet. This usually takes a few blocks...)
ui->labelFeeEstimation->setText(""); ui->labelFeeEstimation->setText("");
ui->fallbackFeeWarningLabel->setVisible(true);
} }
else else
{ {
@ -662,6 +663,7 @@ void SendCoinsDialog::updateSmartFeeLabel()
std::max(feeRate.GetFeePerK(), CWallet::GetRequiredFee(1000))) + "/kB"); std::max(feeRate.GetFeePerK(), CWallet::GetRequiredFee(1000))) + "/kB");
ui->labelSmartFee2->hide(); ui->labelSmartFee2->hide();
ui->labelFeeEstimation->setText(tr("Estimated to begin confirmation within %n block(s).", "", estimateFoundAtBlocks)); ui->labelFeeEstimation->setText(tr("Estimated to begin confirmation within %n block(s).", "", estimateFoundAtBlocks));
ui->fallbackFeeWarningLabel->setVisible(false);
} }
updateFeeMinimizedLabel(); updateFeeMinimizedLabel();

Loading…
Cancel
Save