From 26a88ebb925817b4fd9b4e05855de190b12b58ae Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Thu, 20 Jun 2019 17:50:27 -0400
Subject: [PATCH] Turn the donation mechanism into a feedback button

---
 src/mainwindow.cpp | 16 +++++++---------
 src/mainwindow.ui  |  2 +-
 src/settings.cpp   | 14 ++++----------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2c09989..466cbcc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -601,16 +601,14 @@ void MainWindow::addressBook() {
 
 
 void MainWindow::donate() {
-    // Set up a donation to me :)
     removeExtraAddresses();
 
-    ui->Address1->setText(Settings::getDonationAddr(
-                            Settings::getInstance()->isSaplingAddress(ui->inputsCombo->currentText())));
+    ui->Address1->setText(Settings::getDonationAddr(true));
     ui->Address1->setCursorPosition(0);
-    ui->Amount1->setText("0.01");
-    ui->MemoTxt1->setText(tr("Thanks for supporting SilentDragon!"));
+    ui->Amount1->setText("0.00");
+    ui->MemoTxt1->setText(tr("Some feedback about SilentDragon or Hush..."));
 
-    ui->statusBar->showMessage(tr("Donate 0.01 ") % Settings::getTokenName() % tr(" to support SilentDragon"));
+    ui->statusBar->showMessage(tr("Send Duke some private and shielded feedback about ") % Settings::getTokenName() % tr(" or SilentDragon"));
 
     // And switch to the send tab.
     ui->tabWidget->setCurrentIndex(1);
@@ -855,7 +853,7 @@ void MainWindow::importPrivKey() {
     pui.buttonBox->button(QDialogButtonBox::Save)->setVisible(false);
     pui.helpLbl->setText(QString() %
                         tr("Please paste your private keys here, one per line") % ".\n" %
-                        tr("The keys will be imported into your connected komodod node"));  
+                        tr("The keys will be imported into your connected Hush node"));  
 
     if (d.exec() == QDialog::Accepted && !pui.privKeyTxt->toPlainText().trimmed().isEmpty()) {
         auto rawkeys = pui.privKeyTxt->toPlainText().trimmed().split("\n");
@@ -876,7 +874,7 @@ void MainWindow::importPrivKey() {
 
         // Show the dialog that keys will be imported. 
         QMessageBox::information(this,
-            "Imported", tr("The keys were imported. It may take several minutes to rescan the blockchain. Until then, functionality may be limited"),
+            "Imported", tr("The keys were imported! It may take several minutes to rescan the blockchain. Until then, functionality may be limited"),
             QMessageBox::Ok);
     }
 }
@@ -967,7 +965,7 @@ void MainWindow::exportKeys(QString addr) {
     // Wire up save button
     QObject::connect(pui.buttonBox->button(QDialogButtonBox::Save), &QPushButton::clicked, [=] () {
         QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
-                           allKeys ? "zcash-all-privatekeys.txt" : "zcash-privatekey.txt");
+                           allKeys ? "hush-all-privatekeys.txt" : "hush-privatekey.txt");
         QFile file(fileName);
         if (!file.open(QIODevice::WriteOnly)) {
             QMessageBox::information(this, tr("Unable to open file"), file.errorString());
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index c8a81cd..618cf87 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1191,7 +1191,7 @@
   </action>
   <action name="actionDonate">
    <property name="text">
-    <string>&amp;Donate</string>
+    <string>&amp;Send Duke Feedback</string>
    </property>
   </action>
   <action name="actionCheck_for_Updates">
diff --git a/src/settings.cpp b/src/settings.cpp
index ea08fe1..803870f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -199,16 +199,10 @@ QString Settings::getTokenName() {
 }
 
 QString Settings::getDonationAddr(bool sapling) {
-    if (Settings::getInstance()->isTestnet()) 
-        if (sapling)
-            return "ztestsapling1wn6889vznyu42wzmkakl2effhllhpe4azhu696edg2x6me4kfsnmqwpglaxzs7tmqsq7kudemp5";
-        else
-            return "ztn6fYKBii4Fp4vbGhkPgrtLU4XjXp4ZBMZgShtopmDGbn1L2JLTYbBp2b7SSkNr9F3rQeNZ9idmoR7s4JCVUZ7iiM5byhF";
-    else 
-        if (sapling)
-            return "zs1knmre6w5dyy2mjdxw2g8v93adr3fh9jtwqx76863557sjunlqq563cftxaz05saskyyn72xm2hv";
-        else
-            return "zcEgrceTwvoiFdEvPWcsJHAMrpLsprMF6aRJiQa3fan5ZphyXLPuHghnEPrEPRoEVzUy65GnMVyCTRdkT6BYBepnXh6NBYs";    
+    if (Settings::getInstance()->isTestnet())  {
+	    return "ztestsaplingXXX";
+    }
+    return "zs1aq4xnrkjlnxx0zesqye7jz3dfrf3rjh7q5z6u8l6mwyqqaam3gx3j2fkqakp33v93yavq46j83q";
 }
 
 bool Settings::addToZcashConf(QString confLocation, QString line) {