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 @@
-
@@ -649,7 +647,7 @@
- Signin
+ Home
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;
};
});