From 4cfe87490fe078f2b2ca5c825b8398857a2cd31d Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Wed, 10 Sep 2014 11:47:41 -0700
Subject: [PATCH] settings: show wallet network on sidebar

---
 js/controllers/open.js          | 1 -
 js/controllers/version.js       | 6 ++++--
 js/models/core/WalletFactory.js | 3 ---
 views/includes/version.html     | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/js/controllers/open.js b/js/controllers/open.js
index fb3c01ac4..019932988 100644
--- a/js/controllers/open.js
+++ b/js/controllers/open.js
@@ -37,7 +37,6 @@ angular.module('copayApp.controllers').controller('OpenController', function($sc
       try {
         w = walletFactory.open($scope.selectedWalletId, passphrase);
       } catch (e) {
-        throw e;
         errMsg = e.message;
       };
       if (!w) {
diff --git a/js/controllers/version.js b/js/controllers/version.js
index f61e7af4b..5adfafd7a 100644
--- a/js/controllers/version.js
+++ b/js/controllers/version.js
@@ -3,9 +3,11 @@
 angular.module('copayApp.controllers').controller('VersionController',
   function($scope, $rootScope, $http, notification) {
 
+    var w = $rootScope.wallet;
+
     $scope.version = copay.version;
     $scope.commitHash = copay.commitHash;
-    $scope.networkName = config.networkName;
+    $scope.networkName = w ? w.getNetworkName() : '';
     $scope.defaultLanguage = config.defaultLanguage;
     if (_.isUndefined($rootScope.checkVersion))
       $rootScope.checkVersion = true;
@@ -30,4 +32,4 @@ angular.module('copayApp.controllers').controller('VersionController',
       });
     }
 
-  });
\ No newline at end of file
+  });
diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index 818a40a63..ab57dcea7 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -80,7 +80,6 @@ WalletFactory.prototype._checkRead = function(walletId) {
  * @return {string} network name
  */
 WalletFactory.prototype.obtainNetworkName = function(obj) {
-  console.log(JSON.stringify(obj));
   return obj.networkName ||
     obj.opts.networkName ||
     obj.publicKeyRing.networkName ||
@@ -107,8 +106,6 @@ WalletFactory.prototype.fromObj = function(obj, skipFields) {
       throw new Error('unknown field:' + k);
   });
 
-  alert(networkName);
-
   var w = Wallet.fromObj(obj, this.storage, this.networks[networkName], this.blockchains[networkName]);
   if (!w) return false;
   this._checkVersion(w.version);
diff --git a/views/includes/version.html b/views/includes/version.html
index a554d6bcf..55e19d99c 100644
--- a/views/includes/version.html
+++ b/views/includes/version.html
@@ -1,6 +1,6 @@
 <div ng-controller="VersionController">
   <small>v{{version}} ({{defaultLanguage}})</small> 
   <small>#{{commitHash}}</small> 
-  <small ng-if="networkName=='testnet'">[ {{networkName}} ]</small>
+  <small ng-if="networkName ==='testnet' || networkName ==='livenet'">[ {{networkName}} ]</small>
 </div>