From ab6aeae91a1243f1cdb0ced38dde11f5a85173c4 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 10 Dec 2018 13:01:28 -0800
Subject: [PATCH 1/2] Fix MS20161: Fix INVENTORY notification dot state
---
scripts/system/commerce/wallet.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 3a8462c5cb..d472d8d071 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -578,7 +578,7 @@ function notificationDataProcessPageHistory(data) {
var shouldShowDotUpdates = false;
function notificationPollCallbackUpdates(updatesArray) {
- shouldShowDotUpdates = shouldShowDotUpdates || updatesArray.length > 0;
+ shouldShowDotUpdates = updatesArray.length > 0;
ui.messagesWaiting(shouldShowDotUpdates || shouldShowDotHistory);
if (updatesArray.length > 0) {
From 75ba1cb3c7729f090c7bc30f11fd028f229c91c1 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 11 Dec 2018 10:30:12 -0800
Subject: [PATCH 2/2] I forgot to clear dot immediately
---
interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 3 +++
scripts/system/commerce/wallet.js | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index eb4e1f7aa8..f8e2c9115b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -100,6 +100,9 @@ Rectangle {
console.log("Failed to get Available Updates", result.data.message);
} else {
exchangeMoneyButtonContainer.messagesWaiting = result.data.updates.length > 0;
+ if (!exchangeMoneyButtonContainer.messagesWaiting) {
+ sendToScript({method: 'clearShouldShowDotUpdates'});
+ }
}
}
}
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index d472d8d071..5c312b0ec5 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -536,6 +536,10 @@ function fromQml(message) {
shouldShowDotHistory = false;
ui.messagesWaiting(shouldShowDotUpdates || shouldShowDotHistory);
break;
+ case 'clearShouldShowDotUpdates':
+ shouldShowDotUpdates = false;
+ ui.messagesWaiting(shouldShowDotUpdates || shouldShowDotHistory);
+ break;
case 'http.request':
// Handled elsewhere, don't log.
break;