mirror of https://github.com/BTCPrivate/copay.git
Fixes importing profile with a wallet that is not ready
This commit is contained in:
parent
b49d6b9c01
commit
b9fd442ffd
|
@ -363,7 +363,7 @@ Identity.importFromFullJson = function(str, password, opts, cb) {
|
|||
json.wallets = json.wallets || {};
|
||||
|
||||
async.map(json.wallets, function(walletData, callback) {
|
||||
if (!walletData)
|
||||
if (!walletData)
|
||||
return callback();
|
||||
|
||||
iden.importWalletFromObj(walletData, opts, function(err, w) {
|
||||
|
|
|
@ -2488,15 +2488,16 @@ Wallet.prototype.createTxSync = function(toAddress, amountSatStr, comment, utxos
|
|||
|
||||
/**
|
||||
* @desc Updates all the indexes for the current publicKeyRing. This scans
|
||||
* the blockchain looking for transactions on derived addresses.
|
||||
* the blockchain looking for transactions on derived addresses.
|
||||
*
|
||||
* Triggers a wallet {@link Wallet#store} call
|
||||
* @param {Function} callback - called when all indexes have been updated. Receives an error, if any, as first argument
|
||||
*/
|
||||
Wallet.prototype.updateIndexes = function(callback) {
|
||||
var self = this;
|
||||
if (!self.isReady())
|
||||
return callback();
|
||||
log.debug('Wallet:' + this.id + ' Updating indexes...');
|
||||
|
||||
var tasks = this.publicKeyRing.indexes.map(function(index) {
|
||||
return function(callback) {
|
||||
self.updateIndex(index, callback);
|
||||
|
|
Loading…
Reference in New Issue