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

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:
Gabriel Edgardo Bazán 2017-05-15 14:57:00 -03:00 committed by GitHub
parent ffcc0f9fff 88b6e722f2
commit d22cea024c
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,11 @@ angular.module('copayApp.controllers').controller('addressesController', functio
walletService.getAddress($scope.wallet, true, function(err, addr) {
if (err) {
ongoingProcess.set('generatingNewAddress', false);
$scope.gapReached = true;
if (err.toString().match('MAIN_ADDRESS_GAP_REACHED')) {
$scope.gapReached = true;
} else {
popupService.showAlert(err);
}
$timeout(function() {
$scope.$digest();
});

2
src/js/controllers/tab-receive.js
View File

@ -21,7 +21,7 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
if (err) {
//Error is already formated
return popupService.showAlert(err);
popupService.showAlert(err);
}
$scope.addr = addr;

10
www/views/addresses.html
View File

@ -33,6 +33,11 @@
<div class="item item-icon-right view-all" ng-if="viewAll.value" ng-click="viewAllAddresses()">
<span translate>View All Addresses</span>
<i class="icon ion-ios-arrow-thin-right"></i>
</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">
@ -41,11 +46,6 @@
</div>
<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">
<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>&nbsp<a ng-click="readMore()" ng-if="!showMore" translate>Read more</a></p>