From 370fbd5924ec12db11be1d4edd13134de4d1cdfd Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 13 Nov 2015 16:00:28 -0300
Subject: [PATCH] Return automatically after set unit/lang/alt/color

---
 public/views/includes/sidebar.html           |  2 +-
 public/views/preferences.html                |  2 +-
 public/views/preferencesGlobal.html          | 10 +++++-----
 src/js/controllers/index.js                  |  1 +
 src/js/controllers/preferencesAltCurrency.js |  8 ++++++--
 src/js/controllers/preferencesColor.js       | 12 ++++++------
 src/js/controllers/preferencesLanguage.js    |  3 ++-
 src/js/controllers/preferencesUnit.js        |  7 +++++--
 src/js/services/go.js                        |  4 ++++
 9 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/public/views/includes/sidebar.html b/public/views/includes/sidebar.html
index 106bf4af7..bb41f2c7a 100644
--- a/public/views/includes/sidebar.html
+++ b/public/views/includes/sidebar.html
@@ -39,7 +39,7 @@
     <li>
       <a ng-click="$root.go('preferencesGlobal')" class="oh">
         <i class="icon-arrow-right3 size-18 right m10t"></i>
-        <i class="fi-widget size-24 db left m20r m5t"></i>
+        <i class="fi-widget size-24 icon"></i>
         <div class="tu text-bold">
           <span class="size-12">Settings</span>
         </div>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index a124cdf9e..ff31aaa0f 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -50,7 +50,7 @@
     <li ng-click="$root.go('backup')"  ng-hide="index.isPrivKeyExternal">
       <div class="right text-gray">
         <span class="text-warning" ng-show="index.needsBackup">
-          <i class="fi-alert"></i><span translate>Still not done</span>
+          <i class="fi-alert"></i> <span translate>Still not done</span>
         </span>
         <i class="icon-arrow-right3 size-24 text-gray"></i>
       </div>
diff --git a/public/views/preferencesGlobal.html b/public/views/preferencesGlobal.html
index 54da4fa4b..7162d2bb3 100644
--- a/public/views/preferencesGlobal.html
+++ b/public/views/preferencesGlobal.html
@@ -8,7 +8,7 @@
 
 <div class="content preferences" ng-controller="preferencesGlobalController as prefGlobal" ng-init="prefGlobal.init()">
 
-  <ul ng-show="!index.noFocusedWallet" class="no-bullet m0 ">
+  <ul class="no-bullet m0 ">
     <h4></h4>
 
     <li ng-click="$root.go('preferencesLanguage')">
@@ -19,7 +19,7 @@
       <div translate>Language</div>
     </li>
   </ul> 
-  <ul ng-show="!index.noFocusedWallet" class="no-bullet m0 ">
+  <ul class="no-bullet m0 ">
     <h4></h4>
     <li ng-click="$root.go('preferencesUnit')">
       <div class="right text-gray">
@@ -36,7 +36,7 @@
       <div translate>Alternative Currency</div>
     </li>
   </ul>
-  <ul ng-show="!index.noFocusedWallet" class="no-bullet m0 ">
+  <ul class="no-bullet m0 ">
     <h4></h4>
     <li ng-click="$root.go('preferencesFee')"
       ng-show="(index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)">
@@ -51,7 +51,7 @@
       <div translate>Use Unconfirmed Funds</div>
     </li>
   </ul>
-  <ul ng-show="!index.noFocusedWallet" class="no-bullet m0 ">
+  <ul class="no-bullet m0 ">
     <h4></h4>
     <li>
       <switch id="glidera-enabled" name="glideraEnabled" ng-model="glideraEnabled" class="green right"></switch>
@@ -59,7 +59,7 @@
     </li>
  
     <!-- Disabled for testnet 
-    <li ng-show="!index.noFocusedWallet && glideraEnabled">
+    <li ng-show="glideraEnabled">
       <span>Glidera Sandbox</span>
       <switch id="glidera-testnet" name="glideraTestnet" ng-model="glideraTestnet" class="green right"></switch>
     </li>
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 194c2884c..3dcedc4ae 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -868,6 +868,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
 
   self.updateHistory = function() {
     var fc = profileService.focusedClient;
+    if (!fc) return;
     var walletId = fc.credentials.walletId;
 
     if (!fc.isComplete() || self.updatingTxHistory[walletId]) return;
diff --git a/src/js/controllers/preferencesAltCurrency.js b/src/js/controllers/preferencesAltCurrency.js
index 1a5d9a725..c62ab2281 100644
--- a/src/js/controllers/preferencesAltCurrency.js
+++ b/src/js/controllers/preferencesAltCurrency.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesAltCurrencyController',
-  function($scope, $rootScope, configService, go, rateService, lodash) {
+  function($scope, $timeout, $log, configService, rateService, lodash, go) {
     this.hideAdv = true;
     this.hidePriv = true;
     this.hideSecret = true;
@@ -48,8 +48,12 @@ angular.module('copayApp.controllers').controller('preferencesAltCurrencyControl
       };
 
       configService.set(opts, function(err) {
-        if (err) console.log(err);
+        if (err) $log.warn(err);
+        go.preferencesGlobal();
         $scope.$emit('Local/UnitSettingUpdated');
+        $timeout(function() {
+          $scope.$apply();
+        }, 100);
       });
     };
 
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js
index 77b99f870..6f9946416 100644
--- a/src/js/controllers/preferencesColor.js
+++ b/src/js/controllers/preferencesColor.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesColorController',
-  function($scope, configService, profileService, go) {
+  function($scope, $timeout, $log, configService, profileService, go) {
     var config = configService.getSync();
     this.colorOpts = [
       '#DD4B39',
@@ -33,12 +33,12 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
       opts.colorFor[walletId] = color;
 
       configService.set(opts, function(err) {
-        if (err) {
-          $scope.$emit('Local/DeviceError', err);
-          return;
-        }
-        self.color = color;
+        if (err) $log.warn(err);
+        go.preferences();
         $scope.$emit('Local/ColorUpdated');
+        $timeout(function() {
+          $scope.$apply();
+        }, 100);
       });
 
     };
diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js
index 45170e7eb..687ab635e 100644
--- a/src/js/controllers/preferencesLanguage.js
+++ b/src/js/controllers/preferencesLanguage.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesLanguageController',
-  function($scope, $log, $timeout, configService, uxLanguage) {
+  function($scope, $log, $timeout, configService, uxLanguage, go) {
 
     this.availableLanguages = uxLanguage.getLanguages();
 
@@ -17,6 +17,7 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController
 
       configService.set(opts, function(err) {
         if (err) $log.warn(err);
+        go.preferencesGlobal();
         $scope.$emit('Local/LanguageSettingUpdated');
         $timeout(function() {
           $scope.$apply();
diff --git a/src/js/controllers/preferencesUnit.js b/src/js/controllers/preferencesUnit.js
index 7df745976..cface9b0d 100644
--- a/src/js/controllers/preferencesUnit.js
+++ b/src/js/controllers/preferencesUnit.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesUnitController',
-  function($rootScope, $scope, $log, configService, go) {
+  function($scope, $timeout, $log, configService, go) {
     var config = configService.getSync();
     this.unitName = config.wallet.settings.unitName;
     this.unitOpts = [
@@ -52,8 +52,11 @@ angular.module('copayApp.controllers').controller('preferencesUnitController',
 
       configService.set(opts, function(err) {
         if (err) $log.warn(err);
+        go.preferencesGlobal();
         $scope.$emit('Local/UnitSettingUpdated');
-        go.preferences();
+        $timeout(function() {
+          $scope.$apply();
+        }, 100);
       });
 
     };
diff --git a/src/js/services/go.js b/src/js/services/go.js
index 782683e7f..eb09e5d41 100644
--- a/src/js/services/go.js
+++ b/src/js/services/go.js
@@ -79,6 +79,10 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope,
     $state.go('preferences');
   };
 
+  root.preferencesGlobal = function() {
+    $state.go('preferencesGlobal');
+  };
+
   root.reload = function() {
     $state.reload();
   };