From 342c8e7ea6fce4177beccc468360060c61b7b531 Mon Sep 17 00:00:00 2001
From: Javier <javier@bitpay.com>
Date: Mon, 31 Oct 2016 16:52:16 -0300
Subject: [PATCH] fix display options

---
 www/views/preferencesNotifications.html | 55 ++++++++++++-------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/www/views/preferencesNotifications.html b/www/views/preferencesNotifications.html
index 5a5b95927..e380cd442 100644
--- a/www/views/preferencesNotifications.html
+++ b/www/views/preferencesNotifications.html
@@ -7,45 +7,44 @@
 
   <ion-content>
     <div class="list">
-      <div ng-if="PNEnabledByUser">
-        <div class="item item-divider" translate>Notifications</div>
+      <div class="item item-divider" translate>Notifications</div>
 
+      <div ng-if="PNEnabledByUser">
         <ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()" ng-if="usePushNotifications">
           <span class="toggle-label" translate>Enable push notifications</span>
         </ion-toggle>
-
-        <ion-toggle ng-model="emailNotifications.value" toggle-class="toggle-balanced" ng-change="emailNotificationsChange()">
-          <span class="toggle-label" translate>Enable email notifications</span>
-        </ion-toggle>
-
-        <div ng-if="emailNotifications.value">
-          <div class="settings-explanation">
-            <div class="settings-description" translate>
-              You'll receive email notifications about payments sent and received from your wallets.
-            </div>
-          </div>
-
-          <form name="emailForm" ng-submit="save()" novalidate>
-            <div class="list settings-input-group">
-              <label class="item item-input item-stacked-label">
-                <span class="input-label" translate>Email Address</span>
-                <input type="email" id="email" name="email" ng-model="newEmail.value" required></input>
-              </label>
-            </div>
-            <button type="submit"
-              class="button button-standard button-primary"
-              ng-disabled="emailForm.$invalid || (newEmail.value == latestEmail.value)" translate>Save
-            </button>
-          </form>
-        </div>
       </div>
 
       <div ng-if="!PNEnabledByUser && isIOSApp">
-        <div class="item item-divider" translate>Notifications</div>
         <div class="padding text-light" translate>
           Push notifications for {{appName}} are currently disabled. Enable them in the Settings app.
         </div>
       </div>
+
+      <ion-toggle ng-model="emailNotifications.value" toggle-class="toggle-balanced" ng-change="emailNotificationsChange()">
+        <span class="toggle-label" translate>Enable email notifications</span>
+      </ion-toggle>
+
+      <div ng-if="emailNotifications.value">
+        <div class="settings-explanation">
+          <div class="settings-description" translate>
+            You'll receive email notifications about payments sent and received from your wallets.
+          </div>
+        </div>
+
+        <form name="emailForm" ng-submit="save()" novalidate>
+          <div class="list settings-input-group">
+            <label class="item item-input item-stacked-label">
+              <span class="input-label" translate>Email Address</span>
+              <input type="email" id="email" name="email" ng-model="newEmail.value" required></input>
+            </label>
+          </div>
+          <button type="submit"
+            class="button button-standard button-primary"
+            ng-disabled="emailForm.$invalid || (newEmail.value == latestEmail.value)" translate>Save
+          </button>
+        </form>
+      </div>
     </div>
   </ion-content>
 </ion-view>