From 65d5f32309d7282158df803437330ecf1b5b1426 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 | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/js/models/Identity.js b/js/models/Identity.js
index 2b72c6c10..f7c712c6c 100644
--- a/js/models/Identity.js
+++ b/js/models/Identity.js
@@ -3,7 +3,6 @@ var _ = require('lodash');
 var preconditions = require('preconditions').singleton();
 var inherits = require('inherits');
 var events = require('events');
-var log = require('../util/log');
 var async = require('async');
 
 var bitcore = require('bitcore');
@@ -14,9 +13,9 @@ var PrivateKey = require('./PrivateKey');
 var Wallet = require('./Wallet');
 var PluginManager = require('./PluginManager');
 var Async = require('./Async');
-
-var version = require('../../version').version;
 var cryptoUtil = require('../util/crypto');
+var log = require('../util/log');
+var version = require('../../version').version;
 
 /**
  * @desc
@@ -122,7 +121,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);
@@ -132,7 +131,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);
   });
 };
 
@@ -553,8 +552,8 @@ Identity.prototype.createWallet = function(opts, cb) {
   var self = this;
 
   var w = new walletClass(opts);
-  self.updateFocusedTimestamp(w.getId());
   self.bindWallet(w);
+  self.updateFocusedTimestamp(w.getId());
   self.storeWallet(w, function(err) {
     if (err) return cb(err);
     self.store({
@@ -619,11 +618,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();
   });
 };