Merge pull request #6135 from cmgustavo/bug/gap-error

Show GAP error and returns the latest address
This commit is contained in:
Gabriel Edgardo Bazán 2017-05-30 11:24:50 -03:00 committed by GitHub
commit 7654292330
2 changed files with 5 additions and 5 deletions

View file

@ -836,13 +836,13 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
wallet.createAddress({}, function(err, addr) {
if (err) {
var prefix = gettextCatalog.getString('Could not create address');
if (err.error && err.error.match(/locked/gi)) {
$log.debug(err.error);
if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) {
$log.warn(err);
return $timeout(function() {
createAddress(wallet, cb);
}, 5000);
} else if (err.message && err.message == 'MAIN_ADDRESS_GAP_REACHED') {
$log.warn(err.message);
} else if (err instanceof errors.MAIN_ADDRESS_GAP_REACHED || (err.message && err.message == 'MAIN_ADDRESS_GAP_REACHED')) {
$log.warn(err);
prefix = null;
wallet.getMainAddresses({
reverse: true,