Skip to content

Commit 702e6e0

Browse files
committed
Merge #8678: [Qt][CoinControl] fix UI bug that could result in paying unexpected fee
0480293 [Qt][CoinControl] fix UI bug that could result in paying unexpected fee (Jonas Schnelli)
2 parents 6898213 + 0480293 commit 702e6e0

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/qt/sendcoinsdialog.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,9 @@ void SendCoinsDialog::updateGlobalFeeVariables()
589589
{
590590
nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value();
591591
payTxFee = CFeeRate(0);
592+
593+
// set nMinimumTotalFee to 0 to not accidentally pay a custom fee
594+
CoinControlDialog::coinControl->nMinimumTotalFee = 0;
592595
}
593596
else
594597
{
@@ -781,7 +784,7 @@ void SendCoinsDialog::coinControlUpdateLabels()
781784
ui->radioCustomAtLeast->setVisible(true);
782785

783786
// only enable the feature if inputs are selected
784-
ui->radioCustomAtLeast->setEnabled(CoinControlDialog::coinControl->HasSelected());
787+
ui->radioCustomAtLeast->setEnabled(ui->radioCustomFee->isChecked() && !ui->checkBoxMinimumFee->isChecked() &&CoinControlDialog::coinControl->HasSelected());
785788
}
786789
else
787790
{

0 commit comments

Comments
 (0)