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

Merge pull request #1946 from isocolsky/prevent_multijoin

Browse source 
returning error when allet already exists in profile
This commit is contained in:
Matias Alejo Garcia 2014-12-04 14:47:11 -03:00
commit db429a3dc5
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/models/Identity.js
View file

@ -575,6 +575,13 @@ Identity.prototype.createWallet = function(opts, cb) {
var self = this;
var w = new walletClass(opts);
console.log(_.keys(self.wallets));
console.log(w.getId());
if (_.contains(_.keys(self.wallets), w.getId())) {
return cb('walletAlreadyExists');
}
self.wallets[w.getId()] = w;
self.updateFocusedTimestamp(w.getId());
self.bindWallet(w);

5
js/models/Wallet.js
View file

@ -2550,7 +2550,10 @@ Wallet.prototype.isComplete = function() {
* @param {string} version - the new version for the wallet
*/
Wallet.prototype.setVersion = function(version) {
this.version = this.opts.version = version;
this.version = version;
if (this.opts) {
this.opts.version = version;
}
};
/**