Round 2

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

@@ -80,7 +80,6 @@ Rectangle {
                 root.activeView = "checkoutFailure";
             } else {
                 root.itemHref = result.data.download_url;
-                console.log("ZRF TEST " + root.itemHref);
                 root.activeView = "checkoutSuccess";
             }
         }

interface/src/commerce/QmlCommerce.cpp

@@ -15,7 +15,6 @@
 #include "Ledger.h"
 #include "Wallet.h"
 #include <AccountManager.h>
-#include "scripting/WalletScriptingInterface.h"
 
 HIFI_QML_DEF(QmlCommerce)
 
@@ -29,37 +28,12 @@ QmlCommerce::QmlCommerce(QQuickItem* parent) : OffscreenQmlDialog(parent) {
     connect(ledger.data(), &Ledger::historyResult, this, &QmlCommerce::historyResult);
     connect(wallet.data(), &Wallet::keyFilePathIfExistsResult, this, &QmlCommerce::keyFilePathIfExistsResult);
     connect(ledger.data(), &Ledger::accountResult, this, &QmlCommerce::accountResult);
-    connect(ledger.data(), &Ledger::accountResult, this, [&]() {
+    connect(wallet.data(), &Wallet::walletStatusResult, this, &QmlCommerce::walletStatusResult);
-        auto wallet = DependencyManager::get<Wallet>();
-        auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
-        uint status;
-
-        if (wallet->getKeyFilePath() == "" || !wallet->getSecurityImage()) {
-            status = (uint)WalletStatus::WALLET_STATUS_NOT_SET_UP;
-        } else if (!wallet->walletIsAuthenticatedWithPassphrase()) {
-            status = (uint)WalletStatus::WALLET_STATUS_NOT_AUTHENTICATED;
-        } else {
-            status = (uint)WalletStatus::WALLET_STATUS_READY;
-        }
-
-        walletScriptingInterface->setWalletStatus(status);
-        emit walletStatusResult(status);
-    });
 }
 
 void QmlCommerce::getWalletStatus() {
-    auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
+    auto wallet = DependencyManager::get<Wallet>();
-    uint status;
+    wallet->getWalletStatus();
-
-    if (DependencyManager::get<AccountManager>()->isLoggedIn()) {
-        // This will set account info for the wallet, allowing us to decrypt and display the security image.
-        account();
-    } else {
-        status = (uint)WalletStatus::WALLET_STATUS_NOT_LOGGED_IN;
-        emit walletStatusResult(status);
-        walletScriptingInterface->setWalletStatus(status);
-        return;
-    }
 }
 
 void QmlCommerce::getLoginStatus() {

interface/src/commerce/QmlCommerce.h

@@ -27,13 +27,6 @@ class QmlCommerce : public OffscreenQmlDialog {
 public:
     QmlCommerce(QQuickItem* parent = nullptr);
 
-    enum WalletStatus {
-        WALLET_STATUS_NOT_LOGGED_IN = 0,
-        WALLET_STATUS_NOT_SET_UP,
-        WALLET_STATUS_NOT_AUTHENTICATED,
-        WALLET_STATUS_READY
-    };
-
 signals:
     void walletStatusResult(uint walletStatus);
 

interface/src/commerce/Wallet.cpp

@@ -282,9 +282,27 @@ void initializeAESKeys(unsigned char* ivec, unsigned char* ckey, const QByteArra
 
 Wallet::Wallet() {
     auto nodeList = DependencyManager::get<NodeList>();
+    auto ledger = DependencyManager::get<Ledger>();
     auto& packetReceiver = nodeList->getPacketReceiver();
 
     packetReceiver.registerListener(PacketType::ChallengeOwnership, this, "handleChallengeOwnershipPacket");
+
+    connect(ledger.data(), &Ledger::accountResult, this, [&]() {
+        auto wallet = DependencyManager::get<Wallet>();
+        auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
+        uint status;
+
+        if (wallet->getKeyFilePath() == "" || !wallet->getSecurityImage()) {
+            status = (uint)WalletStatus::WALLET_STATUS_NOT_SET_UP;
+        } else if (!wallet->walletIsAuthenticatedWithPassphrase()) {
+            status = (uint)WalletStatus::WALLET_STATUS_NOT_AUTHENTICATED;
+        } else {
+            status = (uint)WalletStatus::WALLET_STATUS_READY;
+        }
+
+        walletScriptingInterface->setWalletStatus(status);
+        emit walletStatusResult(status);
+    });
 }
 
 Wallet::~Wallet() {
@@ -682,3 +700,23 @@ bool Wallet::verifyOwnerChallenge(const QByteArray& encryptedText, const QString
     decryptedText = QString("hello");
     return true;
 }
+
+void Wallet::account() {
+    auto ledger = DependencyManager::get<Ledger>();
+    ledger->account();
+}
+
+void Wallet::getWalletStatus() {
+    auto walletScriptingInterface = DependencyManager::get<WalletScriptingInterface>();
+    uint status;
+
+    if (DependencyManager::get<AccountManager>()->isLoggedIn()) {
+        // This will set account info for the wallet, allowing us to decrypt and display the security image.
+        account();
+    } else {
+        status = (uint)WalletStatus::WALLET_STATUS_NOT_LOGGED_IN;
+        emit walletStatusResult(status);
+        walletScriptingInterface->setWalletStatus(status);
+        return;
+    }
+}

interface/src/commerce/Wallet.h

@@ -17,6 +17,7 @@
 #include <DependencyManager.h>
 #include <Node.h>
 #include <ReceivedMessage.h>
+#include "scripting/WalletScriptingInterface.h"
 
 #include <QPixmap>
 
@@ -50,10 +51,20 @@ public:
 
     void reset();
 
+    void getWalletStatus();
+    enum WalletStatus {
+        WALLET_STATUS_NOT_LOGGED_IN = 0,
+        WALLET_STATUS_NOT_SET_UP,
+        WALLET_STATUS_NOT_AUTHENTICATED,
+        WALLET_STATUS_READY
+    };
+
 signals:
     void securityImageResult(bool exists);
     void keyFilePathIfExistsResult(const QString& path);
 
+    void walletStatusResult(uint walletStatus);
+
 private slots:
     void handleChallengeOwnershipPacket(QSharedPointer<ReceivedMessage> packet, SharedNodePointer sendingNode);
 
@@ -71,6 +82,8 @@ private:
     bool readSecurityImage(const QString& inputFilePath, unsigned char** outputBufferPtr, int* outputBufferLen);
 
     bool verifyOwnerChallenge(const QByteArray& encryptedText, const QString& publicKey, QString& decryptedText);
+
+    void account();
 };
 
 #endif // hifi_Wallet_h

interface/src/scripting/WalletScriptingInterface.cpp

@@ -18,6 +18,11 @@ CheckoutProxy::CheckoutProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(q
 WalletScriptingInterface::WalletScriptingInterface() {
 }
 
+void WalletScriptingInterface::refreshWalletStatus() {
+    auto wallet = DependencyManager::get<Wallet>();
+    wallet->getWalletStatus();
+}
+
 static const QString CHECKOUT_QML_PATH = qApp->applicationDirPath() + "../../../qml/hifi/commerce/checkout/Checkout.qml";
 void WalletScriptingInterface::buy(const QString& name, const QString& id, const int& price, const QString& href) {
     if (QThread::currentThread() != thread()) {

interface/src/scripting/WalletScriptingInterface.h

@@ -20,6 +20,7 @@
 #include <ui/QmlWrapper.h>
 #include <OffscreenUi.h>
 #include "Application.h"
+#include "commerce/Wallet.h"
 
 class CheckoutProxy : public QmlWrapper {
     Q_OBJECT
@@ -36,6 +37,7 @@ class WalletScriptingInterface : public QObject, public Dependency {
 public:
     WalletScriptingInterface();
 
+    Q_INVOKABLE void refreshWalletStatus();
     Q_INVOKABLE uint getWalletStatus() { return _walletStatus; }
     void setWalletStatus(const uint& status) { _walletStatus = status; }
 
@@ -43,6 +45,7 @@ public:
 
 signals:
     void walletStatusChanged();
+    void walletNotSetup();
 
 private:
     uint _walletStatus;

interface/src/ui/overlays/ContextOverlayInterface.cpp

@@ -41,6 +41,7 @@ ContextOverlayInterface::ContextOverlayInterface() {
     _entityPropertyFlags += PROP_MARKETPLACE_ID;
     _entityPropertyFlags += PROP_DIMENSIONS;
     _entityPropertyFlags += PROP_REGISTRATION_POINT;
+    _entityPropertyFlags += PROP_CERTIFICATE_ID;
 
     auto entityTreeRenderer = DependencyManager::get<EntityTreeRenderer>().data();
     connect(entityTreeRenderer, SIGNAL(mousePressOnEntity(const EntityItemID&, const PointerEvent&)), this, SLOT(createOrDestroyContextOverlay(const EntityItemID&, const PointerEvent&)));
@@ -176,7 +177,12 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
 
 bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& entityItemID) {
     EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
-    return (entityProperties.getMarketplaceID().length() != 0);
+    Setting::Handle<bool> _settingSwitch{ "commerce", false };
+    if (_settingSwitch.get()) {
+        return (entityProperties.getCertificateID().length() != 0);
+    } else {
+        return (entityProperties.getMarketplaceID().length() != 0);
+    }
 }
 
 bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {

scripts/system/commerce/wallet.js

@@ -16,6 +16,8 @@
 (function () { // BEGIN LOCAL_SCOPE
     Script.include("/~/system/libraries/accountUtils.js");
 
+    var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace";
+
     // Function Name: onButtonClicked()
     //
     // Description:
@@ -88,6 +90,9 @@
             case 'goToPurchases':
                 tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
                 break;
+            case 'goToMarketplaceItemPage':
+                tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.itemId, MARKETPLACES_INJECT_SCRIPT_URL);
+                break;
             default:
                 print('Unrecognized message from QML:', JSON.stringify(message));
         }

scripts/system/html/js/marketplacesInject.js

@@ -334,7 +334,6 @@
             $('body').addClass("code-injected");
 
             maybeAddLogInButton();
-            maybeAddSetupWalletButton();
             changeDropdownMenu();
 
             var purchaseButton = $('#side-info').find('.btn').first();

scripts/system/marketplaces/marketplaces.js

@@ -129,6 +129,10 @@
         }
     }
 
+    function openWallet() {
+        tablet.pushOntoStack(MARKETPLACE_WALLET_QML_PATH);
+    }
+
     function setCertificateInfo(currentEntityWithContextOverlay, itemMarketplaceId) {
         wireEventBridge(true);
         tablet.sendToQml({
@@ -158,6 +162,7 @@
     Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
     ContextOverlay.contextOverlayClicked.connect(setCertificateInfo);
     GlobalServices.myUsernameChanged.connect(onUsernameChanged);
+    Wallet.refreshWalletStatus();
 
     function onMessage(message) {
 
@@ -214,7 +219,7 @@
             } else if (parsedJsonMessage.type === "LOGIN") {
                 openLoginWindow();
             } else if (parsedJsonMessage.type === "WALLET_SETUP") {
-                tablet.pushOntoStack(MARKETPLACE_WALLET_QML_PATH);
+                openWallet();
             } else if (parsedJsonMessage.type === "MY_ITEMS") {
                 referrerURL = MARKETPLACE_URL_INITIAL;
                 filterText = "";
@@ -281,16 +286,22 @@
             case 'purchases_openWallet':
             case 'checkout_openWallet':
             case 'checkout_setUpClicked':
-                tablet.pushOntoStack(MARKETPLACE_WALLET_QML_PATH);
+                openWallet();
                 break;
             case 'purchases_walletNotSetUp':
-            case 'checkout_walletNotSetUp':
                 wireEventBridge(true);
                 tablet.sendToQml({
                     method: 'updateWalletReferrer',
                     referrer: "purchases"
                 });
-                tablet.pushOntoStack(MARKETPLACE_WALLET_QML_PATH);
+                openWallet();
+            case 'checkout_walletNotSetUp':
+                wireEventBridge(true);
+                tablet.sendToQml({
+                    method: 'updateWalletReferrer',
+                    referrer: message.itemId
+                });
+                openWallet();
                 break;
             case 'checkout_cancelClicked':
                 tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + message.params, MARKETPLACES_INJECT_SCRIPT_URL);

scripts/system/notifications.js

@@ -95,13 +95,15 @@
         EDIT_ERROR: 4,
         TABLET: 5,
         CONNECTION: 6,
+        WALLET: 7,
         properties: [
             { text: "Snapshot" },
             { text: "Level of Detail" },
             { text: "Connection Refused" },
             { text: "Edit error" },
             { text: "Tablet" },
-            { text: "Connection" }
+            { text: "Connection" },
+            { text: "Wallet" }
         ],
         getTypeFromMenuItem: function (menuItemName) {
             var type;
@@ -691,6 +693,7 @@
     Window.notifyEditError = onEditError;
     Window.notify = onNotify;
     Tablet.tabletNotification.connect(tabletNotification);
+    Wallet.walletNotSetup.connect(walletNotSetup);
 
     Messages.subscribe(NOTIFICATIONS_MESSAGE_CHANNEL);
     Messages.messageReceived.connect(onMessageReceived);