From 6aa551b35c64ea3ace2a39f93af4321e1d2d9b6e Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Tue, 5 Jun 2018 17:04:29 -0700 Subject: [PATCH] Don't getNextPage when at beginning (even if that is also the end). --- .../resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml | 2 +- interface/resources/qml/hifi/commerce/wallet/WalletHome.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml b/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml index 21d803b1ab..a416030711 100644 --- a/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml +++ b/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml @@ -523,7 +523,7 @@ Item { visible: !connectionsLoading.visible; clip: true; model: connectionsModel.model; - onAtYEndChanged: if (connectionsList.atYEnd /*&& !connectionsList.atYBeginning*/) { connectionsModel.getNextPage(); } + onAtYEndChanged: if (connectionsList.atYEnd && !connectionsList.atYBeginning) { connectionsModel.getNextPage(); } snapMode: ListView.SnapToItem; // Anchors anchors.fill: parent; diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml index 1c0debb12b..047dcd70d1 100644 --- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml +++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml @@ -239,7 +239,7 @@ Item { // Only auto-refresh if the user hasn't scrolled // and there is more data to grab - if (transactionHistory.atYBeginning && data.history.length && transactionHistoryModel.currentPageToRetrieve >= 0) { + if (transactionHistory.atYBeginning && data.history.length) { refreshTimer.start(); } return result;