From 5c8451a6266200726e5c848f6e34663ac8dffd0e Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 23 Oct 2017 10:36:23 -0700 Subject: [PATCH 1/2] Auto-refresh Wallet Home & Purchases on 4s timer --- .../qml/hifi/commerce/purchases/Purchases.qml | 4 +++- .../qml/hifi/commerce/wallet/WalletHome.qml | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml index c98f212c53..f41bdf55ba 100644 --- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml +++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml @@ -583,9 +583,11 @@ Rectangle { Timer { id: inventoryTimer; - interval: 90000; + interval: 4000; // Change this back to 90000 after demo + //interval: 90000; onTriggered: { if (root.activeView === "purchasesMain" && !root.pendingInventoryReply) { + console.log("Refreshing Purchases..."); root.pendingInventoryReply = true; commerce.inventory(); } diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml index 50891deb60..9323d97fe4 100644 --- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml +++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml @@ -43,6 +43,7 @@ Item { calculatePendingAndInvalidated(); } + refreshTimer.start(); } } @@ -117,6 +118,8 @@ Item { historyReceived = false; commerce.balance(); commerce.history(); + } else { + refreshTimer.stop(); } } } @@ -138,6 +141,17 @@ Item { } } + Timer { + id: refreshTimer; + interval: 4000; // Remove this after demo? + onTriggered: { + console.log("Refreshing Wallet Home..."); + historyReceived = false; + commerce.balance(); + commerce.history(); + } + } + // Recent Activity Rectangle { id: recentActivityContainer; From 30bffdea3234239d25fe806fa30de7f551059f8b Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 23 Oct 2017 11:45:51 -0700 Subject: [PATCH 2/2] Quick bugfix --- interface/resources/qml/hifi/commerce/purchases/Purchases.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml index f41bdf55ba..27737aa0a9 100644 --- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml +++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml @@ -663,6 +663,8 @@ Rectangle { currentPurchasesModelStatus !== previousPurchasesModelStatus) { purchasesModel.setProperty(i, "statusChanged", true); + } else { + purchasesModel.setProperty(i, "statusChanged", false); } } }