anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

The spinner in wallet details now spins when the infinite scroll spinner spins.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-16 15:44:59 +12:00
commit 33d780f2e5
3 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
www/views/includes/walletInfo.html
View file

@ -3,8 +3,8 @@
<a ng-show="walletNotRegistered" ng-click="recreate()" translate>Tap to recreate</a>
<a ng-show="updateStatusError" ng-click="updateAll(true)" translate>Tap to retry</a>
</div>
<span ng-click="onRefresh()" class="right" ng-show="(!updatingStatus && !updatingTxHistory)">&#8635;</span>
<ion-spinner class="spinner-dark recent right loading-wallet" icon="crescent" ng-show="(updatingStatus || updatingTxHistory) &&
<span ng-click="onRefresh()" class="right" ng-show="(!updatingStatus && !vm.updatingTxHistory && !vm.gettingInitialHistory)">&#8635;</span>
<ion-spinner class="spinner-dark recent right loading-wallet" icon="crescent" ng-show="(updatingStatus || vm.updatingTxHistory || vm.gettingInitialHistory) &&
!walletNotRegistered && !updateStatusError && !updateTxHistoryError"></ion-spinner>
<div>

10
www/views/walletDetails.html
View file

@ -284,29 +284,29 @@
<!-- Transactions -->
<div class="wallet-details__no-transaction"
ng-show="!txHistory[0] && !updatingTxHistory && !updateTxHistoryError && !updateStatusError" translate>
ng-show="!txHistory[0] && !vm.gettingInitialHistory && !updateTxHistoryError && !updateStatusError" translate>
No transactions yet
</div>
<div class="wallet-details__no-update-history"
ng-show="!txHistory[0] && !updatingTxHistory && updateTxHistoryError" translate>
ng-show="!txHistory[0] && !vm.gettingInitialHistory && updateTxHistoryError" translate>
Could not update transaction history
</div>
<div ng-show="updatingTxHistory && updatingTxHistoryProgress>5" class="wallet-details__updating-history">
<div ng-show="vm.gettingInitialHistory && updatingTxHistoryProgress>5" class="wallet-details__updating-history">
<span translate>Updating transaction history. Please stand by.</span><br>
<span translate>{{updatingTxHistoryProgress}} transactions downloaded</span>
</div>
<div class="wallet-details__list" ng-show="txHistory[0] && !updatingTxHistory">
<div class="wallet-details__list" ng-show="txHistory[0] && !vm.gettingInitialHistory">
<div ng-repeat="btx in txHistory track by $index" ng-click="openTxModal(btx)">
<span ng-include="'views/includes/walletHistory.html'"></span>
</div>
</div>
<ion-infinite-scroll
ng-if="txHistory[0] && !updatingTxHistory"
ng-if="txHistory[0] && !vm.gettingInitialHistory"
on-infinite="showMore()"
distance="1%">
</ion-infinite-scroll>