BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #674 from cmgustavo/bug/01import-backup 

Open wallet livenet in testnet mode and viceversa when importing backup
This commit is contained in:
Manuel Aráoz 2014-06-13 16:48:29 -03:00
parent 3de3184412 89b69e5d0a
commit 618bff3895
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/models/core/WalletFactory.js
View File

@ -53,7 +53,10 @@ WalletFactory.prototype.fromObj = function(obj) {
obj.opts.reconnectDelay = this.walletDefaults.reconnectDelay;
var w = Wallet.fromObj(obj, this.storage, this.network, this.blockchain);
if (!w) return false;
w.verbose = this.verbose;
this._checkVersion(w.version);
this._checkNetwork(w.getNetworkName());
return w;
};
@ -62,7 +65,6 @@ WalletFactory.prototype.fromEncryptedObj = function(base64, password) {
var walletObj = this.storage.import(base64);
if (!walletObj) return false;
var w = this.fromObj(walletObj);
if (!w) return false;
return w;
};
@ -165,8 +167,6 @@ WalletFactory.prototype.open = function(walletId, opts) {
var w = this.read(walletId);
if (w) {
this._checkVersion(w.version);
this._checkNetwork(w.getNetworkName());
w.store();
}
return w;