fix merge conflicts

www/img/onboarding-checkbox-checked.svg

@@ -0,0 +1,8 @@
+<svg width="35px" height="35px" viewBox="-1 -1 35 35" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <desc>Created with Sketch.</desc>
+  <defs></defs>
+  <g id="Icons/Check/Green" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <circle id="Oval-7" stroke="#12E5B6" stroke-width="2" cx="16.5" cy="16.5" r="16.5"></circle>
+      <polyline id="Shape" stroke="#12E5B6" stroke-width="2" points="8.42105263 17 14.3157895 23.5333333 23.1578947 10.4666667"></polyline>
+  </g>
+</svg>

www/img/onboarding-checkbox-unchecked.svg

@@ -0,0 +1,7 @@
+
+<svg width="35px" height="35px" viewBox="-1 96 35 35" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 40.1 (33804) - http://www.bohemiancoding.com/sketch -->
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <circle id="Oval-7" stroke="#647CE8" stroke-width="2" fill="none" cx="16.5" cy="113.5" r="16.5"></circle>
+</svg>

www/views/confirm.html

@@ -7,7 +7,7 @@
     </ion-nav-back-button>
   </ion-nav-bar>
 
-  <ion-content ng-class="{'slide-to-pay': !hasClick && !insuffientFunds && !noMatchingWallet}">
+  <ion-content ng-class="{'slide-to-pay': isCordova && !insuffientFunds && !noMatchingWallet}">
     <div class="list">
       <div class="item head">
         <div class="sending-label">
@@ -79,13 +79,13 @@
     </div>
     <click-to-accept
       ng-click="approve(statusChangeHandler)"
-      ng-if="hasClick && wallets[0]"
+      ng-if="!isCordova && wallets[0]"
       click-send-status="sendStatus">
       Click to pay
     </click-to-accept>
   </ion-content>
   <slide-to-accept
-    ng-if="!hasClick && wallets[0]"
+    ng-if="isCordova && wallets[0]"
     slide-on-confirm="onConfirm()"
     slide-send-status="sendStatus">
     Slide to pay

www/views/modals/tx-details.html

@@ -45,7 +45,7 @@
             <div>{{wallet.name}}</div>
           </div>
         </div>
-        <div class="item single-line">
+        <div class="item single-line" ng-if="btx.action != 'received'">
           <span class="label" translate>Created by</span>
           <span class="item-note">
             {{btx.creatorName}} <time>{{ (btx.ts || btx.createdOn ) * 1000 | amDateFormat:'MM/DD/YYYY hh:mm a'}}</time>
@@ -66,11 +66,16 @@
         </div>
         <div class="item single-line">
           <span class="label" translate>Confirmations</span>
-          <span class="item-note" ng-if="btx.confirmations < 6">
-            {{btx.confirmations}}
-          </span>
-          <span class="item-note" ng-if="btx.confirmations >= 6">
-            6+
+          <span class="item-note">
+            <span class="assertive" ng-show="!btx.confirmations || btx.confirmations == 0" translate>
+              Unconfirmed
+            </span>
+            <span ng-show="btx.confirmations>0 && !btx.safeConfirmed">
+              {{btx.confirmations}}
+            </span>
+            <span ng-show="btx.safeConfirmed">
+              {{btx.safeConfirmed}}
+            </span>
           </span>
         </div>
         <div ng-if="actionList[0]">

www/views/preferences.html

@@ -29,14 +29,6 @@
         </span>
         <i class="icon bp-arrow-right"></i>
       </a>
-      <a class="item has-setting-value item-icon-right" ui-sref="tabs.preferences.preferencesEmail">
-        <span class="setting-title" translate>Email Notifications</span>
-        <span class="setting-value">
-          <span ng-if="!wallet.email" translate>Disabled</span>
-          <span ng-if="wallet.email">{{wallet.email}}</span>
-        </span>
-        <i class="icon bp-arrow-right"></i>
-      </a>
       <div class="item item-divider" translate>
         Security
       </div>

www/views/preferencesEmail.html

@@ -1,30 +0,0 @@
-<ion-view class="settings">
-  <ion-nav-bar class="bar-royal">
-    <ion-nav-title>
-      {{'Email Notifications'|translate}}
-    </ion-nav-title>
-    <ion-nav-back-button>
-    </ion-nav-back-button>
-  </ion-nav-bar>
-  <ion-content>
-    <div class="settings-explanation">
-      <div class="settings-description" translate>
-        You'll receive email notifications about payments sent and received from {{wallet.name}}.
-      </div>
-      <a href ng-if="emailForExist" class="settings-description-disabled" ng-click="save(null)" translate>Remove email notifications</a>
-    </div>
-    <form name="emailForm" ng-submit="save(email.value)" 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="email.value" required></input>
-        </label>
-      </div>
-      <button type="submit"
-              class="button button-standard button-primary"
-              ng-disabled="emailForm.$invalid" translate>
-        Save
-      </button>
-    </form>
-  </ion-content>
-</ion-view>

www/views/preferencesNotifications.html

@@ -7,20 +7,44 @@
 
   <ion-content>
     <div class="list">
-      <div ng-show="PNEnabledByUser">
-        <div class="item item-divider" translate>Notifications</div>
+      <div class="item item-divider" translate>Notifications</div>
 
-        <ion-toggle ng-model="pushNotifications.value" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
+      <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>
       </div>
 
-      <div ng-show="!PNEnabledByUser && isIOSApp">
-        <div class="item item-divider" translate>Notifications</div>
+      <div ng-if="!PNEnabledByUser && isIOSApp">
         <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>

www/views/tab-home.html

@@ -87,7 +87,7 @@
             Incomplete
           </span>
           <span ng-if="wallet.isComplete()">
-            <span ng-if="!wallet.balanceHidden">{{wallet.status.availableBalanceStr}}</span>
+            <span ng-if="!wallet.balanceHidden">{{wallet.status.pendingBalanceStr}}</span>
             <span ng-if="wallet.balanceHidden" translate>[Balance Hidden]</span>
             <span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
               {{wallet.m}}-of-{{wallet.n}}

www/views/tab-settings.html

@@ -39,7 +39,7 @@
 
       <div class="item item-divider" translate>Preferences</div>
 
-      <a class="item item-icon-left item-icon-right" ui-sref="tabs.notifications" ng-show="usePushNotifications">
+      <a class="item item-icon-left item-icon-right" ui-sref="tabs.notifications">
         <i class="icon big-icon-svg">
           <img src="img/icon-notifications.svg" class="bg"/>
         </i>

www/views/walletDetails.html

@@ -38,10 +38,11 @@
 
 
           <div ng-click='updateAll(true)' ng-show="!updateStatusError && wallet.walletScanStatus != 'error' && !wallet.balanceHidden" on-hold="hideToggle()">
-            <strong class="size-36">{{status.totalBalanceStr}}</strong>
-            <div class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
-            <div class="size-14" ng-if="status.pendingAmount">
-              <span translate>Pending Confirmation</span>: {{status.pendingAmountStr}}
+            <strong ng-if="!status.pendingAmount" class="size-36">{{status.totalBalanceStr}}</strong>
+            <div ng-if="!status.pendingAmount" class="size-14 amount-alternative" ng-if="status.totalBalanceAlternative">{{status.totalBalanceAlternative}} {{status.alternativeIsoCode}}</div>
+            <div class="size-20" ng-if="status.pendingAmount">
+              <div style="margin-bottom:.5rem"><span translate>Available</span>: {{status.totalBalanceStr}}</div>
+              <div><span translate>Confirming</span>: {{status.pendingAmountStr}}</div>
             </div>
           </div>