Merge pull request #200 from JDonadio/bug/history

Fix history
This commit is contained in:
Matias Alejo Garcia 2016-08-18 18:19:30 -03:00 committed by GitHub
commit 37694f424a

View file

@ -100,8 +100,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
if ($scope.isSearching) { if ($scope.isSearching) {
$scope.txHistorySearchResults = filteredTxHistory ? filteredTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT) : []; $scope.txHistorySearchResults = filteredTxHistory ? filteredTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT) : [];
$scope.txHistoryShowMore = filteredTxHistory.length > $scope.txHistorySearchResults.length; $scope.txHistoryShowMore = filteredTxHistory.length > $scope.txHistorySearchResults.length;
} else { } else if (completeTxHistory) {
$scope.txHistory = completeTxHistory ? completeTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT) : []; $scope.txHistory = completeTxHistory.slice(0, (currentTxHistoryPage + 1) * HISTORY_SHOW_LIMIT);
$scope.txHistoryShowMore = completeTxHistory.length > $scope.txHistory.length; $scope.txHistoryShowMore = completeTxHistory.length > $scope.txHistory.length;
} }
}; };