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
3 changed files with 11 additions and 7 deletions
|
|
@ -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();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue