From 9f5d09f1cca7b8edeeab5c0c66c8638c2952561a Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 13 May 2015 12:41:05 -0300
Subject: [PATCH] fix colors

---
 public/views/includes/topbar.html      | 2 +-
 public/views/preferences.html          | 7 ++++---
 public/views/walletHome.html           | 6 +++++-
 src/css/mobile.css                     | 2 +-
 src/js/controllers/preferences.js      | 5 ++++-
 src/js/controllers/preferencesColor.js | 2 +-
 src/js/controllers/walletHome.js       | 3 +++
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/public/views/includes/topbar.html b/public/views/includes/topbar.html
index 8ec5880ca..4be35bfbc 100644
--- a/public/views/includes/topbar.html
+++ b/public/views/includes/topbar.html
@@ -20,7 +20,7 @@
   </section>
 
   <section class="middle tab-bar-section">
-    <h1 class="title ellipsis" ng-style="{'color': noColor ? '#4B6178' : index.backgroundColor}">
+    <h1 class="title ellipsis" ng-style="{'color': noColor ? '#7A8C9E' : index.backgroundColor}">
       {{(titleSection|translate) || index.walletName}}
     </h1>
   </section>
diff --git a/public/views/preferences.html b/public/views/preferences.html
index 523ef6b7e..d40d26613 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -8,14 +8,14 @@
 
 <div class="content preferences" ng-controller="preferencesController as preferences">
 
-  <ul class="no-bullet m0 size-14">
+  <ul class="no-bullet m0 size-14"  ng-show="!index.noFocusedWallet">
     <h4 class="title m0" translate>{{index.walletName}} settings</h4>
 
     <li class="line-b p20" ng-click="$root.go('preferencesColor')">
       <span translate>Color</span>
       <span class="right text-gray">
         <i class="icon-arrow-right3 size-24 right"></i>
-        <span ng-style="{'color':index.backgroundColor || '#1ABC9C'}">&block;</span>
+        <span ng-style="{'color':index.backgroundColor}">&block;</span>
       </span>      
     </li>
     <li class="line-b p20">
@@ -23,7 +23,6 @@
       <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
   </li>
  
- 
     <h4 class="title m0">&nbsp;</h4>
     <li class="line-b p20" ng-click="$root.go('backup')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
@@ -33,6 +32,8 @@
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span translate>Advanced</span>
     </li>
+  </ul>
+  <ul class="no-bullet m0 size-14">
 
     <h4 class="title m0" translate>Global settings</h4>
 
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index a06c86496..543b1c200 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -10,6 +10,10 @@
       <i class="fi-alert"></i> <span translate>You do not have any wallet</span>
     </div>
     <button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
+
+    <div class="text-center text-gray p20v" ng-click="$root.go('preferences')">
+      <button class=" outline dark-gray tiny" translate> Preferences </button>
+    </div>
   </div>
 
   <div class="onGoingProcess" ng-show="index.isOffline">
@@ -457,4 +461,4 @@
   </div>
 </div>
 <div class="extra-margin-bottom"></div>
-<div ng-include="'views/includes/menu.html'"></div>
+<div ng-include="'views/includes/menu.html'" ng-show="!index.noFocusedWallet"></div>
diff --git a/src/css/mobile.css b/src/css/mobile.css
index e1929ad2d..f4fab59a6 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -97,7 +97,7 @@ _:-ms-fullscreen, :root .main {
 }
 
 .tab-bar h1 {
-  color: #1ABC9C;
+  color: #7A8C9E;
   font-weight: 500;
   font-size: 14px;
 }
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index ba63e4225..742db5a84 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -10,10 +10,13 @@ angular.module('copayApp.controllers').controller('preferencesController',
       isoCode: config.wallet.settings.alternativeIsoCode
     }; 
     var fc = profileService.focusedClient;
-    $scope.encrypt = fc.hasPrivKeyEncrypted();
+    if (fc)
+      $scope.encrypt = fc.hasPrivKeyEncrypted();
 
     var unwatch = $scope.$watch('encrypt', function(val) {
       var fc = profileService.focusedClient;
+      if (!fc) return;
+
       if (val && !fc.hasPrivKeyEncrypted()) {
         $rootScope.$emit('Local/NeedsPassword', true, function(err, password) {
           if (err || !password) {
diff --git a/src/js/controllers/preferencesColor.js b/src/js/controllers/preferencesColor.js
index d6e7fe823..d01a878fb 100644
--- a/src/js/controllers/preferencesColor.js
+++ b/src/js/controllers/preferencesColor.js
@@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
   function($scope, configService, profileService, go) {
     var config = configService.getSync();
     this.colorOpts = [
+      '#7A8C9E',
       '#F38F12',
       '#F4D03F',
       '#4A90E2',
@@ -11,7 +12,6 @@ angular.module('copayApp.controllers').controller('preferencesColorController',
       '#9B59B6',
       '#E856EF',
       '#F883B4',
-      '#7A8C9E',
     ];
 
     var fc = profileService.focusedClient;
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index cf35c0bb3..1f9894080 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -356,6 +356,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       return;
 
     var fc = profileService.focusedClient;
+    if (!fc)
+      return;
+
     $timeout(function() {
       storageService.getLastAddress(fc.credentials.walletId, function(err, addr) {
         if (addr) {