From 24e5994f20d7403c1028396cd0809f62dd15f388 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 30 Nov 2017 15:48:57 -0800
Subject: [PATCH] The nuclear option is a bad option.

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml      | 2 +-
 interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml | 1 -
 interface/src/commerce/QmlCommerce.cpp                       | 5 +++++
 interface/src/commerce/QmlCommerce.h                         | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 6af6a484b9..0424dd1edd 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -47,7 +47,7 @@ Rectangle {
             } else if (walletStatus === 1) {
                 if (root.activeView !== "walletSetup") {
                     root.activeView = "walletSetup";
-                    commerce.reset();
+                    commerce.resetLocalWalletOnly();
                 }
             } else if (walletStatus === 2) {
                 if (root.activeView !== "passphraseModal") {
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
index 369f8c1f95..8de831ef75 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -225,7 +225,6 @@ Item {
             height: 50;
             text: "Set Up Wallet";
             onClicked: {
-                commerce.account();
                 root.activeView = "step_2";
             }
         }
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index f29e46d843..435d15d161 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -128,6 +128,11 @@ void QmlCommerce::reset() {
     wallet->reset();
 }
 
+void QmlCommerce::resetLocalWalletOnly() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->reset();
+}
+
 void QmlCommerce::account() {
     auto ledger = DependencyManager::get<Ledger>();
     ledger->account();
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index d4f4aa35d2..fd8dd0d395 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -65,6 +65,7 @@ protected:
     Q_INVOKABLE void history();
     Q_INVOKABLE void generateKeyPair();
     Q_INVOKABLE void reset();
+    Q_INVOKABLE void resetLocalWalletOnly();
     Q_INVOKABLE void account();
 
     Q_INVOKABLE void certificateInfo(const QString& certificateId);