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

various fixes

Browse source
This commit is contained in:
Ivan Socolsky 2014-12-02 14:33:46 -03:00 • committed by Matias Alejo Garcia
commit 19d1bde546
6 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
js/models/Identity.js
View file

@ -151,6 +151,7 @@ Identity.prototype.readAndBindWallet = function(walletId, cb) {
var self = this;
self.retrieveWalletFromStorage(walletId, {}, function(error, wallet) {
if (!error) {
self.wallets[wallet.getId()] = wallet;
self.bindWallet(wallet);
}
return cb(error);
@ -386,6 +387,8 @@ Identity.prototype.importWalletFromObj = function(obj, opts, cb) {
log.debug('Updating Indexes for wallet:' + w.getName());
w.updateIndexes(function(err) {
log.debug('Adding wallet to profile:' + w.getName());
self.wallets[w.getId()] = w;
self.updateFocusedTimestamp(w.getId());
self.bindWallet(w);
self.storeWallet(w, cb);
});
@ -472,7 +475,6 @@ Identity.importFromFullJson = function(str, password, opts, cb) {
*/
Identity.prototype.bindWallet = function(w) {
var self = this;
self.wallets[w.getId()] = w;
log.debug('Binding wallet:' + w.getName());
w.on('txProposalsUpdated', function() {
@ -572,8 +574,9 @@ Identity.prototype.createWallet = function(opts, cb) {
var w = new walletClass(opts);
self.bindWallet(w);
self.wallets[w.getId()] = w;
self.updateFocusedTimestamp(w.getId());
self.bindWallet(w);
self.storeWallet(w, function(err) {
if (err) return cb(err);
@ -664,15 +667,16 @@ Identity.prototype.decodeSecret = function(secret) {
* @return {string} walletId
*/
Identity.prototype.getLastFocusedWalletId = function() {
var max = _.max(this.focusedTimestamp);
var aId = _.findKey(this.wallets) || this.walletIds[0];
if (this.walletIds.length == 0) return undefined;
var max = _.max(this.focusedTimestamps);
if (!max)
return aId;
return this.walletIds[0];
return _.findKey(this.focusedTimestamps, function(ts) {
return ts == max;
}) || aId;
}) || this.walletIds[0];
};
Identity.prototype.updateFocusedTimestamp = function(wid) {