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

better spinners at wallet details

Browse source
This commit is contained in:
Matias Alejo Garcia 2017-01-17 11:41:39 -03:00
commit 716b341dc4
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
4 changed files with 35 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/walletDetails.js
View file

@ -353,11 +353,11 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
listeners = [
$rootScope.$on('bwsEvent', function(e, walletId) {
if (walletId == $scope.wallet.id)
updateStatus();
$scope.updateAll();
}),
$rootScope.$on('Local/TxAction', function(e, walletId) {
if (walletId == $scope.wallet.id)
updateStatus();
$scope.updateAll();
}),
];
});

13
src/sass/views/walletDetails.scss
View file

@ -218,6 +218,7 @@
bottom: 5px;
font-size: 20px;
color: #fff;
width:95%;
}
.wallet-not-backed-up-warning {
@ -234,3 +235,15 @@
a.item {
cursor: pointer;
}
.recent svg {
margin-left:5px;
width:0.7em;
height:0.7em;
stroke: #eee;
}
.updatingHistory {
color: #445;
font-size:0.9em;
}

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

@ -1,4 +1,7 @@
<ion-spinner class="spinner-dark recent right" icon="crescent" ng-show="updatingStatus || (updatingTxHistory && updatingTxHistoryProgress<=5)" ></ion-spinner>
<div>
<span ng-show="wallet.status.wallet.singleAddress" class="size-12"><span translate>Auditable</span></span>
<img style="height:0.6em; margin-right: 1px;" ng-show="wallet.network != 'livenet'" src="img/icon-testnet-white.svg">
<img style="height:0.6em; margin-right: 1px;" ng-show="!wallet.canSign() && !wallet.isPrivKeyExternal()" src="img/icon-read-only-white.svg">
@ -12,5 +15,4 @@
<!-- <img style="height:1em" ng&#45;show="wallet.preferences.email" src="img/icon&#45;email.svg"> -->
<img style="height:0.6em; margin-right: 1px;" ng-show="wallet.usingCustomBWS" src="img/icon-bws-white.svg">
<img style="height:0.6em" ng-show="updatingTxHistory" src="img/icon-sync-white.svg">
</div>

24
www/views/walletDetails.html
View file

@ -194,28 +194,36 @@
<!-- Transactions -->
<div class="oh pr m20t text-gray size-12 text-center"
ng-show="!txHistory[0] && !updatingTxHistory && !txHistoryError && !updateStatusError" translate>
ng-show="!txHistory[0] && !updatingTxHistory && !updateTxHistoryError && !updateStatusError" translate>
No transactions yet
</div>
<div class="oh pr m20t text-gray size-12 text-center"
ng-show="!txHistory[0] && !updatingTxHistory && updateTxHistoryError" translate>
Could not update transaction history
</div>
<div ng-show="updatingTxHistory && updatingTxHistoryProgress>5" class="updatingHistory">
<div class="row" >
<ion-spinner class="spinner-dark" icon="lines"></ion-spinner>
<ion-spinner class="spinner-dark" icon="crescent"></ion-spinner>
</div>
<div class="row" >
<div class="col" translate>Updating transaction history. Please stand by.</div>
</div>
<div class="row" ng-show="updatingTxHistoryProgress>0" >
<div class="col" translate>{{updatingTxHistoryProgress}} transactions downloaded</div>
<div class="col">
<span translate>Updating transaction history. Please stand by.</span><br>
<span translate>{{updatingTxHistoryProgress}} transactions downloaded</span>
</div>
</div>
</div>
<div class="wallet-details__list" ng-show="txHistory[0]">
<div ng-repeat="btx in txHistory track by $index" ng-click="openTxModal(btx)">
<div class="wallet-details__group-label" ng-if="isFirstInGroup($index)">
<span ng-if="isDateInCurrentMonth(getDate(btx.time))" translate>
Recent
<span ng-if="isDateInCurrentMonth(getDate(btx.time))">
<span translate>Recent</span>
</span>
<span ng-if="!isDateInCurrentMonth(getDate(btx.time))">
{{getDate(btx.time) | amDateFormat:'MMMM'}}
</span>