|
|
@ -590,12 +590,12 @@ void SendCoinsDialog::updateGlobalFeeVariables() |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (ui->radioSmartFee->isChecked()) |
|
|
|
if (ui->radioSmartFee->isChecked()) |
|
|
|
{ |
|
|
|
{ |
|
|
|
nTxConfirmTarget = (int)25 - (int)std::max(0, std::min(24, ui->sliderSmartFee->value())); |
|
|
|
nTxConfirmTarget = defaultConfirmTarget - ui->sliderSmartFee->value(); |
|
|
|
payTxFee = CFeeRate(0); |
|
|
|
payTxFee = CFeeRate(0); |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
|
{ |
|
|
|
{ |
|
|
|
nTxConfirmTarget = 25; |
|
|
|
nTxConfirmTarget = defaultConfirmTarget; |
|
|
|
payTxFee = CFeeRate(ui->customFee->value()); |
|
|
|
payTxFee = CFeeRate(ui->customFee->value()); |
|
|
|
fPayAtLeastCustomFee = ui->radioCustomAtLeast->isChecked(); |
|
|
|
fPayAtLeastCustomFee = ui->radioCustomAtLeast->isChecked(); |
|
|
|
} |
|
|
|
} |
|
|
@ -629,7 +629,7 @@ void SendCoinsDialog::updateSmartFeeLabel() |
|
|
|
if(!model || !model->getOptionsModel()) |
|
|
|
if(!model || !model->getOptionsModel()) |
|
|
|
return; |
|
|
|
return; |
|
|
|
|
|
|
|
|
|
|
|
int nBlocksToConfirm = (int)25 - (int)std::max(0, std::min(24, ui->sliderSmartFee->value())); |
|
|
|
int nBlocksToConfirm = defaultConfirmTarget - ui->sliderSmartFee->value(); |
|
|
|
CFeeRate feeRate = mempool.estimateFee(nBlocksToConfirm); |
|
|
|
CFeeRate feeRate = mempool.estimateFee(nBlocksToConfirm); |
|
|
|
if (feeRate <= CFeeRate(0)) // not enough data => minfee
|
|
|
|
if (feeRate <= CFeeRate(0)) // not enough data => minfee
|
|
|
|
{ |
|
|
|
{ |
|
|
|