diff --git a/src/confirm.ui b/src/confirm.ui
index 0485d52..2528d62 100644
--- a/src/confirm.ui
+++ b/src/confirm.ui
@@ -39,26 +39,10 @@
To
- -
-
-
-
- 0
- 0
-
-
-
- Dev Fee Amount
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
+
-
+
-
+
0
0
@@ -71,26 +55,13 @@
- -
-
-
- Dev Textlabel
-
-
-
- -
-
-
-
- 0
- 0
-
-
+
-
+
- Miner Amount
+ TextLabel
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+ true
@@ -104,15 +75,8 @@
- -
-
-
- Miner Textlabel
-
-
-
- -
-
+
-
+
0
@@ -127,20 +91,17 @@
- -
-
+
-
+
- TextLabel
-
-
- true
+ Miner Textlabel
- -
-
+
-
+
-
+
0
0
@@ -153,16 +114,16 @@
- -
-
+
-
+
-
+
0
0
- TextLabel
+ Miner Amount
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 409df82..d208cb4 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -61,7 +61,7 @@ private:
void setDefaultPayFrom();
Tx createTxFromSendPage();
- bool confirmTx(Tx tx, ToFields devFee);
+ bool confirmTx(Tx tx);
void turnstileDoMigration(QString fromAddr = "");
void turnstileProgress();
diff --git a/src/sendtab.cpp b/src/sendtab.cpp
index 984e743..fde3309 100644
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@@ -75,17 +75,6 @@ void MainWindow::setupSendTab() {
" " % Settings::getTokenName());
ui->lblMinerFeeUSD->setText(Settings::getUSDFormat(Settings::getMinerFee()));
- // Dev Fee.
- if (Settings::getDevFee() < 0.0001) {
- ui->lblDevFee->setText("");
- ui->lblDevFeeUSD->setText("");
- ui->lblDevFeeTxt->setText("");
- } else {
- ui->lblDevFee->setText(QString::number(Settings::getDevFee(), 'g', 8) %
- " " % Settings::getTokenName());
- ui->lblDevFeeUSD->setText(Settings::getUSDFormat(Settings::getDevFee()));
- }
-
// Set focus to the first address box
ui->Address1->setFocus();
}
@@ -389,7 +378,7 @@ Tx MainWindow::createTxFromSendPage() {
return tx;
}
-bool MainWindow::confirmTx(Tx tx, ToFields devFee) {
+bool MainWindow::confirmTx(Tx tx) {
auto fnSplitAddressForWrap = [=] (const QString& a) -> QString {
if (!a.startsWith("z")) return a;
@@ -469,7 +458,7 @@ bool MainWindow::confirmTx(Tx tx, ToFields devFee) {
}
}
- // Add two rows for fees
+ // Add fees
{
auto i = tx.toAddrs.size() * 2;
@@ -493,26 +482,6 @@ bool MainWindow::confirmTx(Tx tx, ToFields devFee) {
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
confirm.gridLayout->addWidget(minerFeeUSD, i, 2, 1, 1);
minerFeeUSD->setText(Settings::getUSDFormat(tx.fee));
-
- if (!devFee.addr.isEmpty()) {
- auto labelDevFee = new QLabel(confirm.sendToAddrs);
- labelDevFee->setObjectName(QStringLiteral("labelDevFee"));
- confirm.gridLayout->addWidget(labelDevFee, i+1, 0, 1, 1);
- labelDevFee ->setText("Dev Fee");
-
- auto fee = new QLabel(confirm.sendToAddrs);
- fee->setObjectName(QStringLiteral("devFee"));
- fee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
- confirm.gridLayout->addWidget(fee, i+1, 1, 1, 1);
- fee ->setText(Settings::getZECDisplayFormat(Settings::getDevFee()));
-
- auto devFeeUSD = new QLabel(confirm.sendToAddrs);
- devFeeUSD->setSizePolicy(sizePolicy1);
- devFeeUSD->setObjectName(QStringLiteral("devFeeUSD"));
- devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
- confirm.gridLayout->addWidget(devFeeUSD, i+1, 2, 1, 1);
- devFeeUSD ->setText(Settings::getUSDFormat(Settings::getDevFee()));
- }
}
// And FromAddress in the confirm dialog
@@ -543,14 +512,9 @@ void MainWindow::sendButton() {
// abort the Tx
return;
}
-
- ToFields devFee{ Settings::getDevAddr(tx), Settings::getDevFee(), "", "" };
// Show a dialog to confirm the Tx
- if (confirmTx(tx, devFee)) {
- if (!devFee.addr.isEmpty())
- tx.toAddrs.push_back(devFee);
-
+ if (confirmTx(tx)) {
json params = json::array();
rpc->fillTxJsonParams(params, tx);
std::cout << std::setw(2) << params << std::endl;
diff --git a/src/settings.cpp b/src/settings.cpp
index f141ae8..73aa97d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -188,15 +188,8 @@ QString Settings::getZboardAddr() {
return "zs10m00rvkhfm4f7n23e4sxsx275r7ptnggx39ygl0vy46j9mdll5c97gl6dxgpk0njuptg2mn9w5s";
}
}
-double Settings::getDevFee() {
- if (Settings::getInstance()->isTestnet()) {
- return 0;
- } else {
- return 0;
- }
-}
-double Settings::getTotalFee() { return getMinerFee() + getDevFee(); }
+double Settings::getTotalFee() { return getMinerFee(); }
bool Settings::isValidAddress(QString addr) {
QRegExp zcexp("^z[a-z0-9]{94}$", Qt::CaseInsensitive);
diff --git a/src/settings.h b/src/settings.h
index dae85c1..5bcf0c1 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -69,7 +69,7 @@ public:
static double getMinerFee();
static double getZboardAmount();
static QString getZboardAddr();
- static double getDevFee();
+
static double getTotalFee();
static bool isValidAddress(QString addr);