From cac407c82717995628346c01495297ed2ca0fcf4 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 2 Dec 2014 11:20:47 -0300
Subject: [PATCH] fix Identity

---
 js/models/Identity.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/models/Identity.js b/js/models/Identity.js
index 01da20222..f83c816c1 100644
--- a/js/models/Identity.js
+++ b/js/models/Identity.js
@@ -125,7 +125,7 @@ Identity.open = function(opts, cb) {
 
   var storage = opts.storage || opts.pluginManager.get('DB');
   storage.setCredentials(opts.email, opts.password, opts);
-  storage.getItem(Identity.getKeyForEmail(opts.email), function(err, data) {
+  storage.getItem(Identity.getKeyForEmail(opts.email), function(err, data, headers) {
     var exported;
     if (err) {
       return cb(err);
@@ -135,7 +135,7 @@ Identity.open = function(opts, cb) {
     } catch (e) {
       return cb(e);
     }
-    return cb(null, new Identity(_.extend(opts, exported)));
+    return cb(null, new Identity(_.extend(opts, exported)), headers);
   });
 };
 
@@ -577,6 +577,7 @@ Identity.prototype.createWallet = function(opts, cb) {
   self.wallets[w.getId()] = w;
   self.updateFocusedTimestamp(w.getId());
   self.bindWallet(w);
+  self.updateFocusedTimestamp(w.getId());
   self.storeWallet(w, function(err) {
     if (err) return cb(err);
 
@@ -643,11 +644,10 @@ Identity.prototype.deleteWallet = function(walletId, cb) {
   delete this.focusedTimestamps[walletId];
 
   this.storage.removeItem(Wallet.getStorageKey(walletId), function(err) {
-    if (err) {
-      return cb(err);
-    }
+    if (err) return cb(err);
     self.emitAndKeepAlive('deletedWallet', walletId);
     self.store(null, cb);
+    return cb();
   });
 };