anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

If the copayer upload a backup it does not wait for others

Browse source
This commit is contained in:
Matias Pando 2014-09-10 17:36:17 -03:00
commit 63cffcc921
4 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/models/core/Wallet.js
View file

@ -86,6 +86,9 @@ function Wallet(opts) {
this.lastTimestamp = opts.lastTimestamp || undefined;
this.lastMessageFrom = {};
//to avoid confirmation of copayer's backups if is imported from a file
this.isImported = opts.isImported;
this.paymentRequests = opts.paymentRequests || {};
//network nonces are 8 byte buffers, representing a big endian number
@ -867,6 +870,7 @@ Wallet.fromObj = function(o, storage, network, blockchain) {
opts.storage = storage;
opts.network = network;
opts.blockchain = blockchain;
opts.isImported = true;
return new Wallet(opts);
};
@ -2389,7 +2393,7 @@ Wallet.prototype.isShared = function() {
* @return {boolean}
*/
Wallet.prototype.isReady = function() {
var ret = this.publicKeyRing.isComplete() && this.publicKeyRing.isFullyBackup();
var ret = this.publicKeyRing.isComplete() && (this.publicKeyRing.isFullyBackup() || this.isImported);
return ret;
};
@ -2522,4 +2526,4 @@ Wallet.request = function(options, callback) {
return ret;
};
module.exports = Wallet;
module.exports = Wallet;