mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #5996 from cmgustavo/bug/addresses-receive-tab
Fix addresses view. Also show adddress cached if error occurs
This commit is contained in:
commit
d22cea024c
|
@ -87,7 +87,11 @@ angular.module('copayApp.controllers').controller('addressesController', functio
|
||||||
walletService.getAddress($scope.wallet, true, function(err, addr) {
|
walletService.getAddress($scope.wallet, true, function(err, addr) {
|
||||||
if (err) {
|
if (err) {
|
||||||
ongoingProcess.set('generatingNewAddress', false);
|
ongoingProcess.set('generatingNewAddress', false);
|
||||||
|
if (err.toString().match('MAIN_ADDRESS_GAP_REACHED')) {
|
||||||
$scope.gapReached = true;
|
$scope.gapReached = true;
|
||||||
|
} else {
|
||||||
|
popupService.showAlert(err);
|
||||||
|
}
|
||||||
$timeout(function() {
|
$timeout(function() {
|
||||||
$scope.$digest();
|
$scope.$digest();
|
||||||
});
|
});
|
||||||
|
|
|
@ -21,7 +21,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
||||||
|
|
||||||
if (err) {
|
if (err) {
|
||||||
//Error is already formated
|
//Error is already formated
|
||||||
return popupService.showAlert(err);
|
popupService.showAlert(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.addr = addr;
|
$scope.addr = addr;
|
||||||
|
|
|
@ -35,17 +35,17 @@
|
||||||
<i class="icon ion-ios-arrow-thin-right"></i>
|
<i class="icon ion-ios-arrow-thin-right"></i>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="item item-divider item-icon-right" ng-click="newAddress()">
|
||||||
|
<span translate>Unused Addresses</span>
|
||||||
|
<i class="icon ion-ios-plus-empty"></i>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div ng-if="loading" class="updating">
|
<div ng-if="loading" class="updating">
|
||||||
<ion-spinner class="spinner-dark recent" icon="crescent"></ion-spinner>
|
<ion-spinner class="spinner-dark recent" icon="crescent"></ion-spinner>
|
||||||
<span translate>Loading addresses...</span>
|
<span translate>Loading addresses...</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="latestUnused[0]">
|
<div ng-if="latestUnused[0]">
|
||||||
<div class="item item-divider item-icon-right" ng-click="newAddress()">
|
|
||||||
<span translate>Unused Addresses</span>
|
|
||||||
<i class="icon ion-ios-plus-empty"></i>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="box-error" ng-if="gapReached">
|
<div class="box-error" ng-if="gapReached">
|
||||||
<h5 translate>Unused Addresses Limit</h5>
|
<h5 translate>Unused Addresses Limit</h5>
|
||||||
<p><span translate>The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab.</span> <a ng-click="readMore()" ng-if="!showMore" translate>Read more</a></p>
|
<p><span translate>The maximum number of consecutive unused addresses (20) has been reached. When one of your unused addresses receives a payment, a new address will be generated and shown in your Receive tab.</span> <a ng-click="readMore()" ng-if="!showMore" translate>Read more</a></p>
|
||||||
|
|
Loading…
Reference in New Issue