From 64072f83bc2d24f2db65376341830f0d99be9d13 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 15 Sep 2014 14:25:09 -0300
Subject: [PATCH] rebased!

---
 js/models/core/WalletFactory.js | 52 +++++++++++++++------------------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index 48010d1c7..c3c2b505b 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -53,7 +53,6 @@ function WalletFactory(config, version, pluginManager) {
 
   this.storage = new this.Storage(storageOpts);
 
-<<<<<<< HEAD
   this.networks = {
     'livenet': new this.Network(config.network.livenet),
     'testnet': new this.Network(config.network.testnet),
@@ -63,11 +62,7 @@ function WalletFactory(config, version, pluginManager) {
     'testnet': new this.Blockchain(config.network.testnet),
   };
 
-  this.walletDefaults = config.wallet;
-=======
-  this.networkName = config.networkName;
-  this.walletDefaults = config.wallet || {};
->>>>>>> ALL TEST PASSING!!!
+  this.walletDefaults = config.walle || {};
   this.version = version;
 };
 
@@ -100,7 +95,7 @@ WalletFactory.prototype.fromObj = function(obj, skipFields) {
   obj.opts.reconnectDelay = this.walletDefaults.reconnectDelay;
 
   // this is only used if private key or public key ring is skipped
-  obj.opts.networkName = this.networkName;
+  obj.opts.networkName = networkName;
 
   skipFields = skipFields || [];
   skipFields.forEach(function(k) {
@@ -420,29 +415,28 @@ WalletFactory.prototype.joinCreateSession = function(opts, cb) {
   });
 
   joinNetwork.start(opts, function() {
-      joinNetwork.greet(decodedSecret.pubKey, opts.secretNumber);
-      joinNetwork.on('data', function(sender, data) {
-          if (data.type === 'walletId' && data.opts) {
-            if (data.networkName !== decodedSecret.networkName) {
-              return cb('badNetwork');
-            }
+    joinNetwork.greet(decodedSecret.pubKey, opts.secretNumber);
+    joinNetwork.on('data', function(sender, data) {
+      if (data.type === 'walletId' && data.opts) {
+        if (data.networkName !== decodedSecret.networkName) {
+          return cb('badNetwork');
+        }
 
-            data.opts.privateKey = privateKey;
-            data.opts.nickname = nickname;
-            data.opts.passphrase = passphrase;
-            data.opts.id = data.walletId;
-            self.create(data.opts, function(err, w) {
-              if (!err & w) {
-                w.sendWalletReady(s.pubKey);
-              } else {
-                if (!err) err = 'walletFull';
-              }
-              return cb(err, w);
-            });
-
-          });
-      });
-  };
+        data.opts.privateKey = privateKey;
+        data.opts.nickname = nickname;
+        data.opts.passphrase = passphrase;
+        data.opts.id = data.walletId;
+        self.create(data.opts, function(err, w) {
+          if (!err & w) {
+            w.sendWalletReady(s.pubKey);
+          } else {
+            if (!err) err = 'walletFull';
+          }
+          return cb(err, w);
+        });
+      }
+    });
+  });
 };
 
 module.exports = WalletFactory;