From a0a9fe72ac11dd2bebc2c1ac74b8c52706739106 Mon Sep 17 00:00:00 2001
From: random-zebra <random.zebra@protonmail.com>
Date: Sun, 26 Apr 2020 14:33:02 +0200
Subject: [PATCH] [BUG] CustomFeeDialog: proper reset on clearAll Github-Pull:
 #1574 Rebased-From: a10c0f75b8bf508cfc009db6107c35fbb7f075c3

---
 src/qt/pivx/sendcustomfeedialog.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/qt/pivx/sendcustomfeedialog.cpp b/src/qt/pivx/sendcustomfeedialog.cpp
index b4570f1bf308b..326ca0a85ee4e 100644
--- a/src/qt/pivx/sendcustomfeedialog.cpp
+++ b/src/qt/pivx/sendcustomfeedialog.cpp
@@ -70,6 +70,9 @@ void SendCustomFeeDialog::showEvent(QShowEvent *event)
     if (walletModel && walletModel->hasWalletCustomFee()) {
         ui->checkBoxCustom->setChecked(true);
         onCustomChecked();
+    } else {
+        ui->checkBoxRecommended->setChecked(true);
+        onRecommendedChecked();
     }
 }
 
@@ -80,10 +83,12 @@ void SendCustomFeeDialog::onCustomChecked()
     ui->comboBoxRecommended->setEnabled(!isChecked);
     ui->checkBoxRecommended->setChecked(!isChecked);
 
-    if (walletModel && ui->lineEditCustomFee->text().isEmpty()) {
+    if (isChecked && walletModel) {
         CAmount nFee;
         walletModel->getWalletCustomFee(nFee);
         ui->lineEditCustomFee->setText(BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), nFee));
+    } else {
+        ui->lineEditCustomFee->clear();
     }
 }
 
@@ -93,6 +98,9 @@ void SendCustomFeeDialog::onRecommendedChecked()
     ui->lineEditCustomFee->setEnabled(!isChecked);
     ui->comboBoxRecommended->setEnabled(isChecked);
     ui->checkBoxCustom->setChecked(!isChecked);
+    if (isChecked) {
+        ui->lineEditCustomFee->clear();
+    }
 }
 
 // Fast = 1.
@@ -123,8 +131,7 @@ void SendCustomFeeDialog::accept()
 
 void SendCustomFeeDialog::clear()
 {
-    onRecommendedChecked();
-    updateFee();
+    ui->comboBoxRecommended->setCurrentIndex(0);
 }
 
 CFeeRate SendCustomFeeDialog::getFeeRate()