From 1c841e5f217082b7452efb65ef3853b4ec13f166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 18 Nov 2015 10:41:06 -0300
Subject: [PATCH] moving delete wallet and request password to security
 preferences

---
 public/views/preferences.html            | 16 ------------
 public/views/preferencesAdvanced.html    |  5 ----
 public/views/preferencesDeleteWords.html |  3 +++
 public/views/securityPreferences.html    | 32 ++++++++++++++++++------
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/public/views/preferences.html b/public/views/preferences.html
index 7af803f41..1b905d09e 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -67,22 +67,6 @@
       <div translate>Advanced</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>
 
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html
index 1fc70c1a0..195914114 100644
--- a/public/views/preferencesAdvanced.html
+++ b/public/views/preferencesAdvanced.html
@@ -28,11 +28,6 @@
       <i class="icon-arrow-right3 size-24 right text-gray"></i>  
       <span>Wallet Service URL</span>
     </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 218845048..0025f6808 100644
--- a/public/views/preferencesDeleteWords.html
+++ b/public/views/preferencesDeleteWords.html
@@ -22,6 +22,9 @@
     <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>
diff --git a/public/views/securityPreferences.html b/public/views/securityPreferences.html
index f9754ff50..3ee9fce2e 100644
--- a/public/views/securityPreferences.html
+++ b/public/views/securityPreferences.html
@@ -4,16 +4,32 @@
   ng-init="titleSection='Security'; goBackToState = 'preferences'">
 </div>
 
-
 <div class="content preferences" ng-controller="securityPreferencesController as security" >
-
-<h4></h4>
-
+	<h4></h4>
 <ul class="no-bullet m0" ng-show="!index.noFocusedWallet">
-
-  <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 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>