diff --git a/src/confirm.ui b/src/confirm.ui
index 96c1633..6bb28a7 100644
--- a/src/confirm.ui
+++ b/src/confirm.ui
@@ -6,8 +6,8 @@
0
0
- 538
- 458
+ 626
+ 713
@@ -174,19 +174,6 @@
- -
-
-
- color: red;
-
-
- zcashd doesn't seem to have any peers. You might not be connected to the internet, so this transaction might not work.
-
-
- true
-
-
-
-
@@ -200,19 +187,6 @@
- -
-
-
- color: red;
-
-
- You are using a custom fee. Since fees are transparent, you are giving up some privacy. Please use this only if you know what you are doing!
-
-
- true
-
-
-
-
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 840296a..f18c3ab 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -257,11 +257,6 @@ void MainWindow::setupSettingsModal() {
settings.setupUi(&settingsDialog);
Settings::saveRestore(&settingsDialog);
- // Setup save sent check box
- QObject::connect(settings.chkSaveTxs, &QCheckBox::stateChanged, [=](auto checked) {
- Settings::getInstance()->setSaveZtxs(checked);
- });
-
// Setup theme combo
int theme_index = settings.comboBoxTheme->findText(Settings::getInstance()->get_theme_name(), Qt::MatchExactly);
settings.comboBoxTheme->setCurrentIndex(theme_index);
@@ -272,12 +267,6 @@ void MainWindow::setupSettingsModal() {
QMessageBox::information(this, tr("Restart"), tr("Please restart ZecWallet to have the theme apply"), QMessageBox::Ok);
});
- // Save sent transactions
- settings.chkSaveTxs->setChecked(Settings::getInstance()->getSaveZtxs());
-
- // Custom fees
- settings.chkCustomFees->setChecked(Settings::getInstance()->getAllowCustomFees());
-
// Check for updates
settings.chkCheckUpdates->setChecked(Settings::getInstance()->getCheckForUpdates());
@@ -332,13 +321,6 @@ void MainWindow::setupSettingsModal() {
}
if (settingsDialog.exec() == QDialog::Accepted) {
- // Custom fees
- bool customFees = settings.chkCustomFees->isChecked();
- Settings::getInstance()->setAllowCustomFees(customFees);
- ui->minerFeeAmt->setReadOnly(!customFees);
- if (!customFees)
- ui->minerFeeAmt->setText(Settings::getDecimalString(Settings::getMinerFee()));
-
// Check for updates
Settings::getInstance()->setCheckForUpdates(settings.chkCheckUpdates->isChecked());
diff --git a/src/sendtab.cpp b/src/sendtab.cpp
index 8670280..4187993 100644
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@@ -59,8 +59,7 @@ void MainWindow::setupSendTab() {
});
// Fee amount changed
- // Disable custom fees if settings say no
- ui->minerFeeAmt->setReadOnly(!Settings::getInstance()->getAllowCustomFees());
+ ui->minerFeeAmt->setReadOnly(true);
QObject::connect(ui->minerFeeAmt, &QLineEdit::textChanged, [=](auto txt) {
ui->lblMinerFeeUSD->setText(Settings::getUSDFromZecAmount(txt.toDouble()));
});
@@ -472,13 +471,8 @@ void MainWindow::maxAmountChecked(int checked) {
sumAllAmounts += amt->text().toDouble();
}
- if (Settings::getInstance()->getAllowCustomFees()) {
- sumAllAmounts = ui->minerFeeAmt->text().toDouble();
- }
- else {
- sumAllAmounts += Settings::getMinerFee();
- }
-
+ sumAllAmounts += Settings::getMinerFee();
+
auto addr = ui->inputsCombo->currentText();
auto maxamount = rpc->getModel()->getAllBalances().value(addr) - sumAllAmounts;
@@ -528,11 +522,7 @@ Tx MainWindow::createTxFromSendPage() {
tx.toAddrs.push_back( ToFields{addr, amt, memo} );
}
- if (Settings::getInstance()->getAllowCustomFees()) {
- tx.fee = ui->minerFeeAmt->text().toDouble();
- } else {
- tx.fee = Settings::getMinerFee();
- }
+ tx.fee = Settings::getMinerFee();
return tx;
}
@@ -675,13 +665,6 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) {
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
confirm.gridLayout->addWidget(minerFeeUSD, row, 2, 1, 1);
minerFeeUSD->setText(Settings::getUSDFromZecAmount(tx.fee));
-
- if (Settings::getInstance()->getAllowCustomFees() && tx.fee != Settings::getMinerFee()) {
- confirm.warningLabel->setVisible(true);
- } else {
- // Default fee
- confirm.warningLabel->setVisible(false);
- }
}
// Recurring payment info, show only if there is exactly one destination address
diff --git a/src/settings.cpp b/src/settings.cpp
index f654f78..a698c11 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -131,15 +131,6 @@ void Settings::setAllowFetchPrices(bool allow) {
QSettings().setValue("options/allowfetchprices", allow);
}
-bool Settings::getAllowCustomFees() {
- // Load from the QT Settings.
- return QSettings().value("options/customfees", false).toBool();
-}
-
-void Settings::setAllowCustomFees(bool allow) {
- QSettings().setValue("options/customfees", allow);
-}
-
QString Settings::get_theme_name() {
// Load from the QT Settings.
return QSettings().value("options/theme_name", false).toString();
@@ -149,14 +140,6 @@ void Settings::set_theme_name(QString theme_name) {
QSettings().setValue("options/theme_name", theme_name);
}
-bool Settings::getSaveZtxs() {
- // Load from the QT Settings.
- return QSettings().value("options/savesenttx", true).toBool();
-}
-
-void Settings::setSaveZtxs(bool save) {
- QSettings().setValue("options/savesenttx", save);
-}
//=================================
// Static Stuff
diff --git a/src/settings.h b/src/settings.h
index a84e5ab..4363978 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -54,12 +54,6 @@ public:
int getBlockNumber();
void setBlockNumber(int number);
- bool getSaveZtxs();
- void setSaveZtxs(bool save);
-
- bool getAllowCustomFees();
- void setAllowCustomFees(bool allow);
-
bool getAllowFetchPrices();
void setAllowFetchPrices(bool allow);
diff --git a/src/settings.ui b/src/settings.ui
index ad8240c..afdf1eb 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -145,135 +145,7 @@
Options
-
-
-
-
- Shielded transactions are saved locally and shown in the transactions tab. If you uncheck this, shielded transactions will not appear in the transactions tab.
-
-
- true
-
-
-
- -
-
-
- Remember shielded transactions
-
-
-
- -
-
-
- Allow custom fees
-
-
-
- -
-
-
- Connect to github on startup to check for updates
-
-
-
- -
-
-
- Fetch ZEC / USD prices
-
-
-
- -
-
-
- Connect to the internet to fetch ZEC prices
-
-
-
- -
-
-
- Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally.
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Theme
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Clear History
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Allow overriding the default fees when sending transactions. Enabling this option may compromise your privacy since fees are transparent.
-
-
- true
-
-
-
- -
-
-
- Check github for updates at startup
-
-
-
- -
-
-
- Connect via Tor
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
+
-
@@ -303,7 +175,64 @@
- -
+
-
+
+
+ Connect to github on startup to check for updates
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ Fetch ZEC / USD prices
+
+
+
+ -
+
+
+ Connect via Tor
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Theme
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Check github for updates at startup
+
+
+
+ -
@@ -316,6 +245,23 @@
+ -
+
+
+ Connect to the internet to fetch ZEC prices
+
+
+
+ -
+
+
+ Connect to the Tor network via SOCKS proxy running on 127.0.0.1:9050. Please note that you'll have to install and run the Tor service externally.
+
+
+ true
+
+
+