From 4e4aebc7ee66ff152c3f782fae9343b9ae557443 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Mon, 26 Feb 2018 12:02:56 -0800
Subject: [PATCH] get WalletChoice setup flow from My Purchases and
 confirmation. Still not correct referrer.

---
 .../resources/qml/hifi/commerce/checkout/Checkout.qml  | 10 +---------
 .../qml/hifi/commerce/purchases/Purchases.qml          | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 730396af08..372fb3c774 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -59,19 +59,11 @@ Rectangle {
                 if (root.activeView !== "needsLogIn") {
                     root.activeView = "needsLogIn";
                 }
-            } else if (walletStatus === 1) {
+            } else if ((walletStatus === 1) || (walletStatus === 2) || (walletStatus === 3)) {
                 if (root.activeView !== "notSetUp") {
                     root.activeView = "notSetUp";
                     notSetUpTimer.start();
                 }
-            } else if (walletStatus === 2) {
-                if (root.activeView != "preexisting") {
-                    root.activeView = "preexisting";
-                }
-            } else if (walletStatus === 3) {
-                if (root.activeView != "conflicting") {
-                    root.activeView = "conflicting";
-                }
             } else if (walletStatus === 4) {
                 if (root.activeView !== "passphraseModal") {
                     root.activeView = "passphraseModal";
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 97cddc453a..c505baebf4 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -47,19 +47,11 @@ Rectangle {
                 if (root.activeView !== "needsLogIn") {
                     root.activeView = "needsLogIn";
                 }
-            } else if (walletStatus === 1) {
+            } else if ((walletStatus === 1) || (walletStatus === 2) || (walletStatus === 3)) {
                 if (root.activeView !== "notSetUp") {
                     root.activeView = "notSetUp";
                     notSetUpTimer.start();
                 }
-            } else if (walletStatus === 2) {
-                if (root.activeView != "preexisting") {
-                    root.activeView = "preexisting";
-                }
-            } else if (walletStatus === 3) {
-                if (root.activeView != "conflicting") {
-                    root.activeView = "conflicting";
-                }
             } else if (walletStatus === 4) {
                 if (root.activeView !== "passphraseModal") {
                     root.activeView = "passphraseModal";