Merge branch 'wallet/sprint/20' into wallet/dev

This commit is contained in:
Jean-Baptiste Dominguez 2018-08-09 15:52:48 +09:00 committed by GitHub
commit c8d7e88f81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 5417 additions and 1644 deletions

View file

@ -899,7 +899,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
var createAddress = function(wallet, cb) {
$log.debug('Creating address for wallet:', wallet.id);
wallet.createAddress({}, function(err, addr) {
wallet.createAddress({}, function onWalletCreatedAddress(err, addr) {
if (err) {
var prefix = gettextCatalog.getString('Could not create address');
if (err instanceof errors.CONNECTION_ERROR || (err.message && err.message.match(/5../))) {
@ -917,6 +917,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
if (err) return cb(err);
return cb(null, addr[0].address);
});
return;
}
return bwcError.cb(err, prefix, cb);
}