mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #6135 from cmgustavo/bug/gap-error
Show GAP error and returns the latest address
This commit is contained in:
commit
7654292330
|
@ -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",
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue