From a6f5300b21187158675f9d609c621d48aaddef33 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 16 May 2014 12:12:11 -0300
Subject: [PATCH 1/2] better tx sent look

---
 index.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index dbd6c5ac9..03c1b2d04 100644
--- a/index.html
+++ b/index.html
@@ -427,14 +427,18 @@
                   <span ng-show="tx.finallyRejected" class="text-warning">
                     Transaction finally rejected
                   </span>
-                  <p class="small" ng-show="!tx.missingSignatures && tx.sentTs">
-                    <i class="fi-arrow-right size-40"></i>
-                    Sent at {{tx.sentTs | date:'medium'}} |
-                    Transaction ID: 
+                  <div ng-show="!tx.missingSignatures && tx.sentTs">
+                  <span>
+                    Sent
+                  </span>
+                  <p class="text-gray small">
+                    {{tx.sentTs | date:'medium'}}.
+                    ID: 
                     <a href="http://{{getShortNetworkName()}}.insight.is/tx/{{tx.sentTxid}}" target="blank">
                         {{tx.sentTxid}}
                     </a>
                   </p>
+                  </div>
                   <p class="text-gray" ng-show="!tx.finallyRejected && tx.missingSignatures==1"> 
                     One signature missing
                   </p>

From 425703c4479242e32a13f03bb7f9f64b8a4a9ac5 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Fri, 16 May 2014 12:40:26 -0300
Subject: [PATCH 2/2] fixes in settings

---
 config.template.js         | 20 +-------------------
 index.html                 |  4 +---
 js/app.js                  | 15 +++++++++++++++
 js/controllers/settings.js |  4 ++--
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/config.template.js b/config.template.js
index f97bc0ae8..888c72a60 100644
--- a/config.template.js
+++ b/config.template.js
@@ -1,6 +1,4 @@
 'use strict';
-
-var localConfig = JSON.parse(localStorage.getItem('config'));
 var defaultConfig = {
   networkName: 'testnet',
   network: {
@@ -99,25 +97,9 @@ var defaultConfig = {
     port: 3001
   },
   passphrase: {
-    iterations: 1000,
+    iterations: 100,
     storageSalt: 'mjuBtGybi/4=', 
   },
   themes: ['default'],
   verbose: 1,
 };
-
-var config = defaultConfig;
-
-// Merge localConfig
-if (localConfig) {
-  var count = 0;
-  for (name in localConfig) {
-    if (localConfig.hasOwnProperty(name)) {
-      config[name] = localConfig[name];
-    }
-  }
-}
-
-var log = function() {
-  if (config.verbose) console.log(arguments);
-}
diff --git a/index.html b/index.html
index 03c1b2d04..4510d4b8a 100644
--- a/index.html
+++ b/index.html
@@ -26,8 +26,6 @@
                 <a class="button radius small-icon" title="Manual Refresh"
                   ng-disabled="$root.loading"
                   ng-click="refresh()"><i class="fi-refresh"></i></a>
-                <a class="button radius small-icon" title="Settings"
-                  ng-disabled="$root.loading" href="#settings"><i class="fi-widget"></i></a>
                 <a class="button radius small-icon" title="Signout" 
                   ng-click="signout()"><i class="fi-power"></i></a>
               </div>
@@ -649,7 +647,7 @@
               <button type="submit" class="button primary radius right ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
                Save
               </button>
-              <a class="button secondary radius" href="#signin" ng-hide="$root.wallet">Signin</a>
+              <a class="button secondary radius" href="#signin" ng-hide="$root.wallet">Home</a>
             </div>
           </div>
         </form>
diff --git a/js/app.js b/js/app.js
index d048c71b2..8852fd0a4 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1,5 +1,20 @@
 'use strict';
 
+var config = defaultConfig;
+var localConfig = JSON.parse(localStorage.getItem('config'));
+
+if (localConfig) {
+  var count = 0;
+  for (name in localConfig) {
+    if (localConfig.hasOwnProperty(name)) {
+      config[name] = localConfig[name];
+    }
+  }
+}
+
+var log = function() {
+  if (config.verbose) console.log(arguments);
+}
 
 var copay = require('copay');
 
diff --git a/js/controllers/settings.js b/js/controllers/settings.js
index 815494d5c..b87237eef 100644
--- a/js/controllers/settings.js
+++ b/js/controllers/settings.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copay.settings').controller('SettingsController',
-  function($scope, $rootScope, $window) {
+  function($scope, $rootScope, $window, $location) {
     $scope.title = 'Settings';
 
     $scope.networkName = config.networkName;
@@ -31,6 +31,6 @@ angular.module('copay.settings').controller('SettingsController',
         })
       );
 
-      $window.location.reload();
+      $window.location.href= $window.location.origin + $window.location.pathname;
     };
   });