From b34f0180e39fc95d88596a987724b994707e2552 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Mon, 16 Sep 2019 12:26:58 -0400
Subject: [PATCH] Revert "gui: Generate bech32 addresses by default (take 2,
 fixup)"

This reverts commit fa5a4cd813c2f0225dcbc05cd16ae2d1c0d13234.
---
 src/interfaces/node.cpp       |  1 -
 src/interfaces/node.h         |  3 ---
 src/qt/receivecoinsdialog.cpp | 13 +++----------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/interfaces/node.cpp b/src/interfaces/node.cpp
index c80a8789f..3d89e1716 100644
--- a/src/interfaces/node.cpp
+++ b/src/interfaces/node.cpp
@@ -201,7 +201,6 @@ public:
         return GuessVerificationProgress(Params().TxData(), tip);
     }
     bool isInitialBlockDownload() override { return ::ChainstateActive().IsInitialBlockDownload(); }
-    bool isAddressTypeSet() override { return !::gArgs.GetArg("-addresstype", "").empty(); }
     bool getReindex() override { return ::fReindex; }
     bool getImporting() override { return ::fImporting; }
     void setNetworkActive(bool active) override
diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 2f4f396e7..688ff434b 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -155,9 +155,6 @@ public:
     //! Is initial block download.
     virtual bool isInitialBlockDownload() = 0;
 
-    //! Is -addresstype set.
-    virtual bool isAddressTypeSet() = 0;
-
     //! Get reindex.
     virtual bool getReindex() = 0;
 
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index df8d5115d..de453cf74 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -7,7 +7,6 @@
 #include <qt/receivecoinsdialog.h>
 #include <qt/forms/ui_receivecoinsdialog.h>
 
-#include <interfaces/node.h>
 #include <qt/addresstablemodel.h>
 #include <qt/optionsmodel.h>
 #include <qt/platformstyle.h>
@@ -93,16 +92,10 @@ void ReceiveCoinsDialog::setModel(WalletModel *_model)
         // Last 2 columns are set by the columnResizingFixer, when the table geometry is ready.
         columnResizingFixer = new GUIUtil::TableViewLastColumnResizingFixer(tableView, AMOUNT_MINIMUM_COLUMN_WIDTH, DATE_COLUMN_WIDTH, this);
 
-        if (model->node().isAddressTypeSet()) {
-            // user explicitly set the type, use it
-            if (model->wallet().getDefaultAddressType() == OutputType::BECH32) {
-                ui->useBech32->setCheckState(Qt::Checked);
-            } else {
-                ui->useBech32->setCheckState(Qt::Unchecked);
-            }
-        } else {
-            // Always fall back to bech32 in the gui
+        if (model->wallet().getDefaultAddressType() == OutputType::BECH32) {
             ui->useBech32->setCheckState(Qt::Checked);
+        } else {
+            ui->useBech32->setCheckState(Qt::Unchecked);
         }
 
         // Set the button to be enabled or disabled based on whether the wallet can give out new addresses.