From 02eb9561b75ee66470b57e4eccef9bd5c54b589a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 29 May 2017 17:09:21 -0300 Subject: [PATCH] Show GAP error and returns the latest address --- app-template/package-template.json | 2 +- src/js/services/walletService.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-template/package-template.json b/app-template/package-template.json index b096ff904..dfed0be08 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -56,7 +56,7 @@ "bezier-easing": "^2.0.3", "bhttp": "^1.2.1", "bitauth": "^0.2.1", - "bitcore-wallet-client": "5.2.0", + "bitcore-wallet-client": "5.2.1", "bower": "^1.7.9", "cordova-android": "5.1.1", "cordova-custom-config": "^3.0.5", diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js index b619c80af..0e4fe3029 100644 --- a/src/js/services/walletService.js +++ b/src/js/services/walletService.js @@ -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,