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

Wallets in both formats only get listed once

Browse source
This commit is contained in:
Ivan Socolsky 2014-09-24 09:39:17 -03:00
commit 48c3633ece
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/models/Storage.js
View file

@ -258,9 +258,14 @@ Storage.prototype.getWallets2 = function(cb) {
Storage.prototype.getWallets = function(cb) {
var self = this;
self.getWallets2(function(wallets1) {
self.getWallets2(function(wallets) {
self.getWallets_Old(function(wallets2) {
return cb(wallets1.concat(wallets2));
var ids = _.pluck(wallets, 'id');
_.each(wallets2, function(w) {
if (!_.contains(ids, w.id))
wallets.push(w);
});
return cb(wallets);
});
})
};