mirror of https://github.com/BTCPrivate/copay.git
Fix view allAddresses
This commit is contained in:
parent
e8a18c9eb4
commit
ede0aec1f1
|
@ -37,8 +37,8 @@ angular.module('copayApp.controllers').controller('addressesController', functio
|
|||
var allAddresses = addresses;
|
||||
|
||||
walletService.getBalance($scope.wallet, {}, function(err, resp) {
|
||||
$scope.loading = false;
|
||||
if (err) {
|
||||
$scope.loading = false;
|
||||
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);
|
||||
|
||||
cachedWallet = $scope.wallet.id;
|
||||
$scope.loading = false;
|
||||
$log.debug('Addresses cached for Wallet:', cachedWallet);
|
||||
$ionicScrollDelegate.resize();
|
||||
$scope.$digest();
|
||||
$timeout(function() {
|
||||
$ionicScrollDelegate.resize();
|
||||
$scope.$digest();
|
||||
});
|
||||
});
|
||||
});
|
||||
};
|
||||
|
|
|
@ -1,4 +1,15 @@
|
|||
#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 {
|
||||
&-explanation, &-button-group {
|
||||
padding: 0 1rem;
|
||||
|
|
|
@ -36,14 +36,8 @@
|
|||
</div>
|
||||
|
||||
<div ng-if="loading" class="updating">
|
||||
<div class="item item-divider row">
|
||||
<ion-spinner class="spinner-dark" icon="crescent"></ion-spinner>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<span translate>Loading addresses...</span>
|
||||
</div>
|
||||
</div>
|
||||
<ion-spinner class="spinner-dark recent" icon="crescent"></ion-spinner>
|
||||
<span translate>Loading addresses...</span>
|
||||
</div>
|
||||
|
||||
<div ng-if="latestUnused[0]">
|
||||
|
|
|
@ -10,14 +10,8 @@
|
|||
<div class="item item-divider"></div>
|
||||
|
||||
<div ng-if="loading" class="updating">
|
||||
<div class="row">
|
||||
<ion-spinner class="spinner-dark" icon="crescent"></ion-spinner>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<span translate>Loading addresses...</span>
|
||||
</div>
|
||||
</div>
|
||||
<ion-spinner class="spinner-dark recent" icon="crescent"></ion-spinner>
|
||||
<span translate>Loading addresses...</span>
|
||||
</div>
|
||||
|
||||
<div ng-show="isCordova && allAddresses[0]">
|
||||
|
|
Loading…
Reference in New Issue