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;
|
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,11 +64,14 @@ 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);
|
||||||
|
$timeout(function() {
|
||||||
$ionicScrollDelegate.resize();
|
$ionicScrollDelegate.resize();
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
function processPaths(list) {
|
function processPaths(list) {
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -36,15 +36,9 @@
|
||||||
</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>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<span translate>Loading addresses...</span>
|
<span translate>Loading addresses...</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div ng-if="latestUnused[0]">
|
<div ng-if="latestUnused[0]">
|
||||||
<div class="item item-divider item-icon-right" ng-click="newAddress()">
|
<div class="item item-divider item-icon-right" ng-click="newAddress()">
|
||||||
|
|
|
@ -10,15 +10,9 @@
|
||||||
<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>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<span translate>Loading addresses...</span>
|
<span translate>Loading addresses...</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div ng-show="isCordova && allAddresses[0]">
|
<div ng-show="isCordova && allAddresses[0]">
|
||||||
<div class="item view-all" ng-click="sendByEmail()">
|
<div class="item view-all" ng-click="sendByEmail()">
|
||||||
|
|
Loading…
Reference in New Issue