From eef61bfd51418ac958e4c57ea14169f411ec556a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 18 Nov 2015 15:14:09 -0300
Subject: [PATCH] security preferences in wallet preferences

---
 public/views/preferences.html            | 42 +++++++++++++++++++-----
 public/views/preferencesAdvanced.html    | 10 +++++-
 public/views/preferencesDeleteWords.html | 42 +++++++++++++++++-------
 public/views/securityPreferences.html    | 35 --------------------
 src/js/controllers/preferences.js        | 17 ++++++----
 src/js/routes.js                         | 12 -------
 6 files changed, 84 insertions(+), 74 deletions(-)
 delete mode 100644 public/views/securityPreferences.html

diff --git a/public/views/preferences.html b/public/views/preferences.html
index 1b905d09e..a75e66212 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -9,8 +9,8 @@
 <div class="content preferences" ng-controller="preferencesController as preferences" ng-init="preferences.init()">
 
   <h4></h4>
-  <ul class="no-bullet m0" ng-show="!index.noFocusedWallet">
 
+  <ul class="no-bullet m0" ng-show="!index.noFocusedWallet">
 
     <li  ng-click="$root.go('preferencesAlias')">
       <div class="right text-gray">
@@ -45,8 +45,6 @@
       <div translate>Hardware wallet</div>
     </li> 
 
-    <h4>
-    </h4>
     <li ng-click="$root.go('backup')"  ng-hide="index.isPrivKeyExternal">
       <div class="right text-gray">
         <span class="text-warning" ng-show="index.needsBackup">
@@ -56,17 +54,45 @@
       </div>
       <div translate>Backup</div>
     </li>
-    
-    <li ng-click="$root.go('securityPreferences')">
-      <i class="icon-arrow-right3 size-24 right text-gray"></i>  
-      <div translate>Security Preferences</div>
-    </li>
 
     <li ng-click="$root.go('preferencesAdvanced')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <div translate>Advanced</div>
     </li>
+
   </ul>
 
+  <h4 translate  ng-show="index.canSign || !deleted">
+    Security preferences
+  </h4>
+
+  <div ng-show="!index.noFocusedWallet && index.canSign">
+
+    <ul class="no-bullet m0">
+
+      <li>
+        <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
+        <div translate>Request Password</div>
+      </li>
+
+      <li  ng-show="preferences.touchidAvailable">
+        <switch id="touchid" name="touchid" ng-model="touchid" class="green right"></switch>
+        <div translate>Scan Fingerprint</div>
+      </li>
+    </ul>
+
+  </div>
+  <div ng-show ="!deleted">
+
+    <ul class="no-bullet m0">
+      <li ng-click="$root.go('deleteWords')">
+        <i class="icon-arrow-right3 size-24 right text-gray"></i>
+        <div translate>Delete seed words</div>
+      </li>
+    </ul>
+
+  </div>
+
 </div>
+
 <div class="extra-margin-bottom"></div>
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html
index 195914114..52bb3634f 100644
--- a/public/views/preferencesAdvanced.html
+++ b/public/views/preferencesAdvanced.html
@@ -7,6 +7,7 @@
 <div class="content preferences" ng-controller="preferencesAdvancedController as preferences">
 
   <h4></h4>
+  
   <ul class="no-bullet m0">
 
     <li  ng-click="$root.go('information')">
@@ -26,9 +27,16 @@
  
     <li  ng-click="$root.go('preferencesBwsUrl')">
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
-      <span>Wallet Service URL</span>
+      <div translate>Wallet Service URL</div>
     </li>
+
+    <li ng-click="$root.go('delete')">
+      <i class="icon-arrow-right3 size-24 right text-gray"></i>
+      <div translate>Delete Wallet</div>
+    </li>
+
   </ul>
+
 </div>
 <div class="extra-margin-bottom"></div>
 
diff --git a/public/views/preferencesDeleteWords.html b/public/views/preferencesDeleteWords.html
index 0025f6808..796ec99bf 100644
--- a/public/views/preferencesDeleteWords.html
+++ b/public/views/preferencesDeleteWords.html
@@ -1,35 +1,53 @@
 <div
   class="topbar-container"
   ng-include="'views/includes/topbar.html'"
-  ng-init="titleSection='Delete Seed Words'; goBackToState = 'securityPreferences'">
+  ng-init="titleSection='Delete Seed Words'; goBackToState = 'preferences'">
 </div>
 
 
 <div class="content preferences" ng-controller="preferencesDeleteWordsController as preferences">
 
   <h4></h4>
+
   <div class="text-center text-gray">
+
     <span translate>Wallet</span>: {{index.walletName}}
     <span ng-show="index.alias">({{index.alias}})</span>
+
   </div>
+
   <h4 class="text-warning text-center m0" translate>Warning!</h4>
+
   <div class="box-notification" ng-show="preferences.error" >
+
     <span class="text-warning size-14">
       {{preferences.error|translate}}
     </span>
+
   </div>
+
   <div class="columns text-center">
-    <p translate class="size-14 text-gray" ng-show="!index.needsBackup" >  <span translate>
-              Once you have copied your wallet seed down, it is recommended to delete it from this device.
-            </span></p>
-     <p translate class="size-14 text-gray" ng-show="index.needsBackup" >  <span translate>
-              Need to do backup
-            </span></p>       
+
+    <p translate class="size-14 text-gray" ng-show="!index.needsBackup" >
+      <span translate>
+        Once you have copied your wallet seed down, it is recommended to delete it from this device.
+      </span>
+    </p>
+
+    <p translate class="size-14 text-gray" ng-show="index.needsBackup" >
+      <span translate>
+        Need to do backup
+      </span>
+    </p>
+
     <button class="button round expand warning" ng-disabled="index.needsBackup" ng-click="preferences.delete()" translate>
-       <i class="fi-trash"></i>
-       <span translate>
-      DELETE WORDS
-    </span>
+      <i class="fi-trash"></i>
+      <span translate>
+        DELETE WORDS
+      </span>
+
     </button>
+
   </div>
-  </div>
+
+</div>
diff --git a/public/views/securityPreferences.html b/public/views/securityPreferences.html
deleted file mode 100644
index 3ee9fce2e..000000000
--- a/public/views/securityPreferences.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<div 
-  class="topbar-container" 
-  ng-include="'views/includes/topbar.html'"
-  ng-init="titleSection='Security'; goBackToState = 'preferences'">
-</div>
-
-<div class="content preferences" ng-controller="securityPreferencesController as security" >
-	<h4></h4>
-<ul class="no-bullet m0" ng-show="!index.noFocusedWallet">
-	<li ng-click="$root.go('delete')">
-    	<i class="icon-arrow-right3 size-24 right text-gray"></i>  
-    	<div translate>Delete Wallet</div>
-    </li>
-	<li ng-click="$root.go('deleteWords')" ng-show ="!security.deleted">
-    	<i class="icon-arrow-right3 size-24 right text-gray"></i>
-    	<div translate>Delete seed words</div>
-	</li>
-
- </ul>
- <div ng-show="!index.noFocusedWallet && index.canSign">
-    <h4 translate  ng-show="index.canSign">
-      Spending Restrictions
-    </h4>
-    <ul class="no-bullet m0">
-      <li>
-        <switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
-        <div translate>Request Password</div>
-      </li>
-      <li  ng-show="preferences.touchidAvailable">
-        <switch id="touchid" name="touchid" ng-model="touchid" class="green right"></switch>
-        <div translate>Scan Fingerprint</div>
-      </li>
-    </ul>
-  </div>
-  <h4></h4>
diff --git a/src/js/controllers/preferences.js b/src/js/controllers/preferences.js
index 1701f16be..046d4e6da 100644
--- a/src/js/controllers/preferences.js
+++ b/src/js/controllers/preferences.js
@@ -2,7 +2,13 @@
 
 angular.module('copayApp.controllers').controller('preferencesController',
   function($scope, $rootScope, $timeout, $log, configService, profileService) {
-    
+
+    var fc = profileService.focusedClient;
+    $scope.deleted = false;
+    if (fc.credentials && !fc.credentials.mnemonicEncrypted && !fc.credentials.mnemonic) {
+      $scope.deleted = true;
+    }
+
     this.init = function() {
       var config = configService.getSync();
       var fc = profileService.focusedClient;
@@ -37,8 +43,8 @@ angular.module('copayApp.controllers').controller('preferencesController',
           });
         });
       } else {
-        if (!val && fc.hasPrivKeyEncrypted())  {
-          profileService.unlockFC(function(err){
+        if (!val && fc.hasPrivKeyEncrypted()) {
+          profileService.unlockFC(function(err) {
             if (err) {
               $scope.encrypt = true;
               return;
@@ -70,14 +76,13 @@ angular.module('copayApp.controllers').controller('preferencesController',
       opts.touchIdFor[walletId] = newVal;
 
       $rootScope.$emit('Local/RequestTouchid', function(err) {
-        if (err) { 
+        if (err) {
           $log.debug(err);
           $timeout(function() {
             $scope.touchidError = true;
             $scope.touchid = oldVal;
           }, 100);
-        }
-        else {
+        } else {
           configService.set(opts, function(err) {
             if (err) {
               $log.debug(err);
diff --git a/src/js/routes.js b/src/js/routes.js
index 0e2da59b8..b2baef96c 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -286,18 +286,6 @@ angular
       }
     })
 
-    .state('securityPreferences', {
-      url: '/securityPreferences',
-      templateUrl: 'views/securityPreferences.html',
-      walletShouldBeComplete: true,
-      needProfile: true,
-      views: {
-        'main': {
-          templateUrl: 'views/securityPreferences.html'
-        },
-      }
-    })
-
     .state('preferencesAdvanced', {
       url: '/preferencesAdvanced',
       templateUrl: 'views/preferencesAdvanced.html',