From e1659ed520bcad856a478ea35332d9704c4adc9b Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 26 Sep 2018 14:57:47 -0700
Subject: [PATCH] fix old bad merge, and if told referrer while already setup,
 follow immediately

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index fdad664bf4..d659d7abdb 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -776,6 +776,9 @@ Rectangle {
             case 'updateWalletReferrer':
                 walletSetup.referrer = message.referrer;
                 walletChoice.referrer = message.referrer;
+                if (Commerce.walletStatus !== 1) { // Already set up. Do it now!
+                   followReferrer({ referrer: walletSetup.referrer });
+                } // Otherwise we'll followReferrer later.
             break;
             case 'inspectionCertificate_resetCert':
                 // NOP
@@ -837,7 +840,7 @@ Rectangle {
     }
 
     function followReferrer(msg) {
-        if (msg.referrer === '' || msg.referrer === 'marketplace cta') {
+        if (msg.referrer === '') {
             root.activeView = "initialize";
             Commerce.getWalletStatus();
         } else if (msg.referrer === 'purchases') {