From ad1da3e225336c49285a33c385fa158140672b33 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Mon, 18 Jun 2018 14:26:46 -0700 Subject: [PATCH] Fix MS16012: Correct the criteria used to determine empty txn history --- .../resources/qml/hifi/commerce/wallet/WalletHome.qml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml index 4cf6db7889..2a6ddfddfb 100644 --- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml +++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml @@ -253,8 +253,12 @@ Item { anchors.left: parent.left; anchors.right: parent.right; - Item { // On empty history. We don't want to flash and then replace, so don't show until we know we're zero. - visible: transactionHistoryModel.count === 0 && transactionHistoryModel.currentPageToRetrieve < 0; + Item { + // On empty history. We don't want to flash and then replace, so don't show until we know we should. + // The history is empty when it contains 1 item (the pending item count) AND there are no pending items. + visible: transactionHistoryModel.count === 1 && + transactionHistoryModel.retrievedAtLeastOnePage && + transactionHistoryModel.get(0).count === 0; anchors.centerIn: parent; width: parent.width - 12; height: parent.height;