aboutsummaryrefslogtreecommitdiff
path: root/src/qt/coincontroldialog.cpp
diff options
context:
space:
mode:
authorGregory Sanders <[email protected]>2017-05-11 16:41:53 -0400
committerGregory Sanders <[email protected]>2017-05-11 22:28:46 -0400
commit091a9ae21c47ea7c479e58465ff8aaee7a378fc5 (patch)
treef5b5f3e4a8c47f0e7aa09f74a450194db6566981 /src/qt/coincontroldialog.cpp
parentMerge #10308: [wallet] Securely erase potentially sensitive keys/values (diff)
downloaddiscoin-091a9ae21c47ea7c479e58465ff8aaee7a378fc5.tar.xz
discoin-091a9ae21c47ea7c479e58465ff8aaee7a378fc5.zip
remove minimum total fee option
Diffstat (limited to 'src/qt/coincontroldialog.cpp')
-rw-r--r--src/qt/coincontroldialog.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
index 2a331d4fa..135cf6f70 100644
--- a/src/qt/coincontroldialog.cpp
+++ b/src/qt/coincontroldialog.cpp
@@ -513,8 +513,6 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
// Fee
nPayFee = CWallet::GetMinimumFee(nBytes, nTxConfirmTarget, ::mempool, ::feeEstimator);
- if (nPayFee > 0 && coinControl->nMinimumTotalFee > nPayFee)
- nPayFee = coinControl->nMinimumTotalFee;
if (nPayAmount > 0)
{
@@ -573,7 +571,7 @@ void CoinControlDialog::updateLabels(WalletModel *model, QDialog* dialog)
l5->setText(((nBytes > 0) ? ASYMP_UTF8 : "") + QString::number(nBytes)); // Bytes
l7->setText(fDust ? tr("yes") : tr("no")); // Dust
l8->setText(BitcoinUnits::formatWithUnit(nDisplayUnit, nChange)); // Change
- if (nPayFee > 0 && (coinControl->nMinimumTotalFee < nPayFee))
+ if (nPayFee > 0)
{
l3->setText(ASYMP_UTF8 + l3->text());
l4->setText(ASYMP_UTF8 + l4->text());