Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel

Commerce: Fix the behavior of the 'cancel' button in Wallet Setup

interface/resources/qml/hifi/commerce/checkout/Checkout.qml

@@ -41,6 +41,7 @@ Rectangle {
     property bool debugCheckoutSuccess: false;
     property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
     property bool isWearable;
+    property string referrer;
     // Style
     color: hifi.colors.white;
     Connections {
@@ -131,7 +132,7 @@ Rectangle {
         id: notSetUpTimer;
         interval: 200;
         onTriggered: {
-            sendToScript({method: 'checkout_walletNotSetUp', itemId: itemId});
+            sendToScript({method: 'checkout_walletNotSetUp', itemId: itemId, referrer: referrer});
         }
     }
 
@@ -877,6 +878,7 @@ Rectangle {
                 itemName = message.params.itemName;
                 root.itemPrice = message.params.itemPrice;
                 itemHref = message.params.itemHref;
+                referrer = message.params.referrer;
                 setBuyText();
             break;
             default:

interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml

@@ -252,7 +252,7 @@ Item {
             height: 50;
             text: "Cancel";
             onClicked: {
-                sendSignalToWallet({method: 'walletSetup_cancelClicked'});
+                sendSignalToWallet({method: 'walletSetup_cancelClicked', referrer: root.referrer });
             }
         }   
     }

scripts/system/commerce/wallet.js

@@ -61,10 +61,26 @@
     function fromQml(message) {
         switch (message.method) {
             case 'passphrasePopup_cancelClicked':
-            case 'walletSetup_cancelClicked':
             case 'needsLogIn_cancelClicked':
                 tablet.gotoHomeScreen();
                 break;
+            case 'walletSetup_cancelClicked':
+                switch (message.referrer) {
+                    case '': // User clicked "Wallet" app
+                    case undefined:
+                    case null:
+                        tablet.gotoHomeScreen();
+                        break;
+                    case 'purchases':
+                    case 'marketplace cta':
+                    case 'mainPage':
+                        tablet.gotoWebScreen(MARKETPLACE_URL, MARKETPLACES_INJECT_SCRIPT_URL);
+                        break;
+                    default: // User needs to return to an individual marketplace item URL
+                        tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.referrer, MARKETPLACES_INJECT_SCRIPT_URL);
+                        break;
+                }
+                break;
             case 'needsLogIn_loginClicked':
                 openLoginWindow();
                 break;

scripts/system/html/js/marketplacesInject.js

@@ -243,13 +243,14 @@
         });
     }
 
-    function buyButtonClicked(id, name, author, price, href) {
+    function buyButtonClicked(id, name, author, price, href, referrer) {
         EventBridge.emitWebEvent(JSON.stringify({
             type: "CHECKOUT",
             itemId: id,
             itemName: name,
             itemPrice: price ? parseInt(price, 10) : 0,
-            itemHref: href
+            itemHref: href,
+            referrer: referrer
         }));
     }
 
@@ -316,7 +317,8 @@
                 $(this).closest('.grid-item').find('.item-title').text(),
                 $(this).closest('.grid-item').find('.creator').find('.value').text(),
                 $(this).closest('.grid-item').find('.item-cost').text(),
-                $(this).attr('data-href'));
+                $(this).attr('data-href'),
+                "mainPage");
         });
     }
 
@@ -420,7 +422,8 @@
                             $('#top-center').find('h1').text(),
                             $('#creator').find('.value').text(),
                             cost,
-                            href);
+                            href,
+                            "itemPage");
                         }
                     });
                 maybeAddPurchasesButton();

scripts/system/marketplaces/marketplaces.js

@@ -436,7 +436,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
                 wireEventBridge(true);
                 tablet.sendToQml({
                     method: 'updateWalletReferrer',
-                    referrer: message.itemId
+                    referrer: message.referrer === "itemPage" ? message.itemId : message.referrer
                 });
                 openWallet();
                 break;