From b1b06989b7c49760683cfa4900c092e958d10f73 Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Sat, 17 Nov 2018 10:09:42 -0800
Subject: [PATCH] Discourage creation of new sprout addresses

---
 src/mainwindow.cpp |  8 ++++++++
 src/mainwindow.ui  | 17 ++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 52c49c1..758f203 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -841,6 +841,14 @@ void MainWindow::setupTransactionsTab() {
 }
 
 void MainWindow::addNewZaddr(bool sapling) {
+    if (!sapling) {
+        auto confirm = QMessageBox::question(this, "Sprout Address", 
+        "Sprout addresses are inefficient, and will be deprecated in the future in favour of Sapling addresses.\n\n"
+        "Are you sure you want to create a new Sprout address?", QMessageBox::Yes, QMessageBox::No);
+        if (confirm != QMessageBox::Yes)
+            return;
+    }    
+
     rpc->newZaddr(sapling, [=] (json reply) {
         QString addr = QString::fromStdString(reply.get<json::string_t>());
         // Make sure the RPC class reloads the z-addrs for future use
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 4aad812..8bee872 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -22,7 +22,7 @@
     <item row="0" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="currentIndex">
-       <number>1</number>
+       <number>2</number>
       </property>
       <widget class="QWidget" name="tab">
        <attribute name="title">
@@ -603,13 +603,6 @@
                  </property>
                 </widget>
                </item>
-               <item>
-                <widget class="QRadioButton" name="rdioZAddr">
-                 <property name="text">
-                  <string>z-Addr(Sprout)</string>
-                 </property>
-                </widget>
-               </item>
                <item>
                 <widget class="QRadioButton" name="rdioTAddr">
                  <property name="sizePolicy">
@@ -623,6 +616,13 @@
                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QRadioButton" name="rdioZAddr">
+                 <property name="text">
+                  <string>z-Addr(Sprout)</string>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </item>
              <item>
@@ -977,7 +977,6 @@
   <tabstop>sendTransactionButton</tabstop>
   <tabstop>cancelSendButton</tabstop>
   <tabstop>balancesTable</tabstop>
-  <tabstop>rdioZAddr</tabstop>
   <tabstop>rdioTAddr</tabstop>
   <tabstop>listRecieveAddresses</tabstop>
   <tabstop>btnRecieveNewAddr</tabstop>