BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix view allAddresses

This commit is contained in:
Gustavo Maximiliano Cortez 2017-05-15 10:07:03 -03:00
parent e8a18c9eb4
commit ede0aec1f1
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/controllers/addresses.js
View File

@ -37,8 +37,8 @@ angular.module('copayApp.controllers').controller('addressesController', functio
var allAddresses = addresses; var allAddresses = addresses;
walletService.getBalance($scope.wallet, {}, function(err, resp) { walletService.getBalance($scope.wallet, {}, function(err, resp) {
$scope.loading = false;
if (err) { if (err) {
$scope.loading = false;
return popupService.showAlert(bwcError.msg(err, gettextCatalog.getString('Could not update wallet'))); return popupService.showAlert(bwcError.msg(err, gettextCatalog.getString('Could not update wallet')));
} }
@ -64,9 +64,12 @@ angular.module('copayApp.controllers').controller('addressesController', functio
$scope.allAddresses = $scope.noBalance.concat(withBalance); $scope.allAddresses = $scope.noBalance.concat(withBalance);
cachedWallet = $scope.wallet.id; cachedWallet = $scope.wallet.id;
$scope.loading = false;
$log.debug('Addresses cached for Wallet:', cachedWallet); $log.debug('Addresses cached for Wallet:', cachedWallet);
$ionicScrollDelegate.resize(); $timeout(function() {
$scope.$digest(); $ionicScrollDelegate.resize();
$scope.$digest();
});
}); });
}); });
}; };

11
src/sass/views/addresses.scss
View File

@ -1,4 +1,15 @@
#addresses { #addresses {
@extend .deflash-blue;
.updating {
text-align: center;
font-size: 0.9em;
color: $v-mid-gray;
padding-top: 1.3rem;
.spinner svg {
stroke: #111;
fill: #111;
}
}
.addr { .addr {
&-explanation, &-button-group { &-explanation, &-button-group {
padding: 0 1rem; padding: 0 1rem;

10
www/views/addresses.html
View File

@ -36,14 +36,8 @@
</div> </div>
<div ng-if="loading" class="updating"> <div ng-if="loading" class="updating">
<div class="item item-divider row"> <ion-spinner class="spinner-dark recent" icon="crescent"></ion-spinner>
<ion-spinner class="spinner-dark" icon="crescent"></ion-spinner> <span translate>Loading addresses...</span>
</div>
<div class="row">
<div class="col">
<span translate>Loading addresses...</span>
</div>
</div>
</div> </div>
<div ng-if="latestUnused[0]"> <div ng-if="latestUnused[0]">

10
www/views/allAddresses.html
View File

@ -10,14 +10,8 @@
<div class="item item-divider"></div> <div class="item item-divider"></div>
<div ng-if="loading" class="updating"> <div ng-if="loading" class="updating">
<div class="row"> <ion-spinner class="spinner-dark recent" icon="crescent"></ion-spinner>
<ion-spinner class="spinner-dark" icon="crescent"></ion-spinner> <span translate>Loading addresses...</span>
</div>
<div class="row">
<div class="col">
<span translate>Loading addresses...</span>
</div>
</div>
</div> </div>
<div ng-show="isCordova && allAddresses[0]"> <div ng-show="isCordova && allAddresses[0]">