Removing donation stuff

src/mainwindow.cpp

@@ -108,11 +108,10 @@ MainWindow::MainWindow(QWidget *parent) :
     // Set up exit action
     QObject::connect(ui->actionExit, &QAction::triggered, this, &MainWindow::close);
 
-    // Set up Feedback action
-    //QObject::connect(ui->actionDonate, &QAction::triggered, this, &MainWindow::donate);
-
+    // Telegram
     QObject::connect(ui->actionTelegram, &QAction::triggered, this, &MainWindow::telegram);
 
+    // Website
     QObject::connect(ui->actionWebsite, &QAction::triggered, this, &MainWindow::website);
 
     // File a bug
@@ -919,60 +918,48 @@ void MainWindow::website() {
     QDesktopServices::openUrl(QUrl(url));
 }
 
-
-void MainWindow::donate() {
-    ui->Address1->setText(Settings::getDonationAddr());
-    ui->Address1->setCursorPosition(0);
-    ui->Amount1->setText("0.00");
-    ui->MemoTxt1->setText(tr("Some feedback about SilentDragonlite or Hush..."));
-    ui->statusBar->showMessage(tr("Send some private and shielded feedback about") % Settings::getTokenName() % tr(" or SilentDragonLite"));
-
-    // And switch to the send tab.
-    ui->tabWidget->setCurrentIndex(1);
-}
-
- void MainWindow::doImport(QList<QString>* keys) {
-     if (rpc->getConnection() == nullptr) {
-         // No connection, just return
-         return;
-     }
-
-     if (keys->isEmpty()) {
-         delete keys;
-         ui->statusBar->showMessage(tr("Private key import rescan in progress. Your funds will be shielded into this wallet and backed up by your seed phrase. This will take some time"));
-        return;
-     }
-
-     // Pop the first key
-     QString key = keys->first();
-     QString key1 = key + QString(" ") + QString("0");
-     keys->pop_front();
-     //bool rescan = keys->isEmpty();
-     
-     if (key.startsWith("SK") || key.startsWith("secret")) { 
-         rpc->importZPrivKey(key, [=] (auto) { this->doImport(keys); });  
-     } else if (key.startsWith("U") || key.startsWith("5") || key.startsWith("L") || key.startsWith("K")) {
-       // 5 = uncompressed, len=51
-       // LK= compressed,   len=52
-       // TODO: verify exact length of (un)compressed
-       if(key.length() > 52) {
-          QMessageBox::critical(this, tr("Wrong Private key format"), 
-                tr("That private key is too long. It should be 51 or 52 characters.") + "\n");
-           return;
-       }
-
-       if(key.length() < 51) {
-          QMessageBox::critical(this, tr("Wrong Private key format"), 
-                tr("That private key is too short. It should be 51 or 52 characters.") + "\n");
-           return;
-       }
-       rpc->importTPrivKey(key,  [=] (auto) { this->doImport(keys); });
-     }else{
-          QMessageBox::critical(this, tr("Wrong Privatkey format"), 
-                tr("Privatkey should start with 5, K, L or U (for taddr) or secret- (for zaddr)") + "\n");
+void MainWindow::doImport(QList<QString>* keys) {
+    if (rpc->getConnection() == nullptr) {
+        // No connection, just return
         return;
     }
- }
+
+    if (keys->isEmpty()) {
+        delete keys;
+        ui->statusBar->showMessage(tr("Private key import rescan in progress. Your funds will be shielded into this wallet and backed up by your seed phrase. This will take some time"));
+        return;
+    }
+
+    // Pop the first key
+    QString key = keys->first();
+    QString key1 = key + QString(" ") + QString("0");
+    keys->pop_front();
+    //bool rescan = keys->isEmpty();
+
+    if (key.startsWith("SK") || key.startsWith("secret")) {
+        rpc->importZPrivKey(key, [=] (auto) { this->doImport(keys); });
+    } else if (key.startsWith("U") || key.startsWith("5") || key.startsWith("L") || key.startsWith("K")) {
+        // 5 = uncompressed, len=51
+        // LK= compressed,   len=52
+        // TODO: verify exact length of (un)compressed
+        if(key.length() > 52) {
+            QMessageBox::critical(this, tr("Wrong Private key format"),
+                                  tr("That private key is too long. It should be 51 or 52 characters.") + "\n");
+            return;
+        }
+
+        if(key.length() < 51) {
+            QMessageBox::critical(this, tr("Wrong Private key format"),
+                                  tr("That private key is too short. It should be 51 or 52 characters.") + "\n");
+            return;
+        }
+        rpc->importTPrivKey(key,  [=] (auto) { this->doImport(keys); });
+    }else{
+        QMessageBox::critical(this, tr("Wrong Privatkey format"),
+                              tr("Privatkey should start with 5, K, L or U (for taddr) or secret- (for zaddr)") + "\n");
+        return;
+    }
+}
 
 // Callback invoked when the RPC has finished loading all the balances, and the UI 
 // is now ready to send transactions.

src/mainwindow.ui

@@ -59,7 +59,7 @@
     <item row="0" column="0" colspan="2">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>3</number>
+       <number>0</number>
       </property>
       <widget class="QWidget" name="tab_6">
        <attribute name="title">
@@ -1931,7 +1931,6 @@
     <property name="title">
      <string>&amp;Help</string>
     </property>
-    <addaction name="actionDonate"/>
     <addaction name="actionTelegram"/>
     <addaction name="actionWebsite"/>
     <addaction name="actionCheck_for_Updates"/>

src/settings.cpp

@@ -362,14 +362,6 @@ QString Settings::getTokenName() {
     }
 }
 
-QString Settings::getDonationAddr() {
-    if (Settings::getInstance()->isTestnet()) 
-            return "ztestsaplingXXX";
-    else 
-            return "zs1fq9f7vg797qaeac9lyx0njyjmjg4w7m60hwq6lhyhvdcqltl5hdkm8vwx9cxy60ehuuz2x49jxt";
-
-}
-
 CAmount Settings::getMinerFee() {
     return CAmount::fromqint64(10000);
 }