mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #239 from JDonadio/fix/spinner-history
Show loading spinner at the end of tx history list
This commit is contained in:
commit
b9be248995
|
@ -9,6 +9,7 @@
|
||||||
</button>
|
</button>
|
||||||
</ion-nav-buttons>
|
</ion-nav-buttons>
|
||||||
</ion-nav-bar>
|
</ion-nav-bar>
|
||||||
|
|
||||||
<ion-content delegate-handle="my-handle">
|
<ion-content delegate-handle="my-handle">
|
||||||
<div class="oh pr" ng-show="wallet && wallet.isComplete()">
|
<div class="oh pr" ng-show="wallet && wallet.isComplete()">
|
||||||
<div ng-style="{'background-color':wallet.color}" class="amount">
|
<div ng-style="{'background-color':wallet.color}" class="amount">
|
||||||
|
@ -88,21 +89,20 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="card list" ng-if="txps[0]">
|
<div class="card list" ng-if="txps[0]">
|
||||||
<div class="item item-heading" translate>
|
<div class="item item-heading" translate>
|
||||||
<span ng-show="requiresMultipleSignatures" translate>Payment Proposals</span>
|
<span ng-show="requiresMultipleSignatures" translate>Payment Proposals</span>
|
||||||
<span ng-show="!requiresMultipleSignatures" translate>Unsent transactions</span>
|
<span ng-show="!requiresMultipleSignatures" translate>Unsent transactions</span>
|
||||||
|
</div>
|
||||||
|
<div ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)">
|
||||||
|
<span ng-include="'views/includes/txp.html'"></span>
|
||||||
|
</div>
|
||||||
|
<div class="item item-footer" ng-show="status.lockedBalanceSat">
|
||||||
|
<span translate>Total Locked Balance</span>:
|
||||||
|
<b>{{status.lockedBalanceStr}} </b>
|
||||||
|
<span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div ng-repeat="tx in txps" class="item item-icon-left" ng-click="openTxpModal(tx)">
|
|
||||||
<span ng-include="'views/includes/txp.html'"></span>
|
|
||||||
</div>
|
|
||||||
<div class="item item-footer" ng-show="status.lockedBalanceSat">
|
|
||||||
<span translate>Total Locked Balance</span>:
|
|
||||||
<b>{{status.lockedBalanceStr}} </b>
|
|
||||||
<span> {{status.lockedBalanceAlternative}} {{status.alternativeIsoCode}} </span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Transactions -->
|
<!-- Transactions -->
|
||||||
|
|
||||||
|
@ -173,15 +173,12 @@
|
||||||
</div>
|
</div>
|
||||||
<span class="label tu warning radius" ng-if="btx.action == 'invalid'" translate>Invalid</span>
|
<span class="label tu warning radius" ng-if="btx.action == 'invalid'" translate>Invalid</span>
|
||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ion-infinite-scroll
|
|
||||||
ng-if="txHistoryShowMore"
|
|
||||||
on-infinite="showMore()"
|
|
||||||
distance="1%">
|
|
||||||
</ion-infinite-scroll>
|
|
||||||
</div>
|
</div>
|
||||||
|
<ion-infinite-scroll
|
||||||
|
ng-if="txHistoryShowMore"
|
||||||
|
on-infinite="showMore()"
|
||||||
|
distance="1%">
|
||||||
|
</ion-infinite-scroll>
|
||||||
</ion-content>
|
</ion-content>
|
||||||
</ion-view>
|
</ion-view>
|
||||||
|
|
|
@ -153,9 +153,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.showMore = function() {
|
$scope.showMore = function() {
|
||||||
currentTxHistoryPage++;
|
$timeout(function() {
|
||||||
$scope.showHistory();
|
currentTxHistoryPage++;
|
||||||
$scope.$broadcast('scroll.infiniteScrollComplete');
|
$scope.showHistory();
|
||||||
|
$scope.$broadcast('scroll.infiniteScrollComplete');
|
||||||
|
}, 100);
|
||||||
};
|
};
|
||||||
|
|
||||||
$scope.updateAll = function(force, cb) {
|
$scope.updateAll = function(force, cb) {
|
||||||
|
|
Loading…
Reference in New Issue