pulled in latest commits from yesterday, merged and handled conflicts

public/views/includes/backupLaterPopup.html

@@ -1,10 +1,10 @@
 <div>
   <h1 translate>Without a backup, you could lose money</h1>
   <span translate>If something happens to this device, this app is deleted, or your password forgotten, neither you nor Bitpay can revoer your funds.</span>
-  <button ng-click="goBack()" class="button button-block button-light">
+  <button ng-click="goBack()" class="button button-block button-light" translate>
     Go back
   </button>
-  <button ng-click="continue()" class="button button-block button-light">
+  <button ng-click="continue()" class="button button-block button-light" translate>
     I understand
   </button>
 </div>

public/views/includes/backupWarningPopup.html

@@ -1,7 +1,7 @@
 <div>
   <h1 translate>Screenshots are not secure</h1>
   <span translate>if you take a screenshot, your backup may be viewed by others apps. You can make a safe backup with paper and a pen.</span>
-  <button ng-click="close()" class="button button-block button-light">
+  <button ng-click="close()" class="button button-block button-light" translate>
     Got it
   </button>
 </div>

public/views/includes/walletActivity.html

@@ -1,41 +1,58 @@
+<span class="wallet-activity">
+
+  <div ng-if="x.types.indexOf('NewCopayer')>=0 && x.wallet.n>1">
+    Copayer joined 
+  </div>
+
+  <div ng-if="x.types.indexOf('NewCopayer')>=0 && x.wallet.n==1">
+    Wallet created
+  </div>
+
+  <div ng-if="x.types.indexOf('NewOutgoingTx')>=0">
+      <span>Payment Sent </span>
+      <div class="wallet-activity-amount">
+      {{x.amountStr}}
+      </div>
+  </div>
 
 
-<span ng-if="x.types.indexOf('NewIncomingTx')>=0">
-  <i class="icon ion-arrow-down-c size-21" ng-style="{'color':x.wallet.color}"></i>
-  {{x.amountStr}}
+
+  <div ng-if="x.types.indexOf('NewIncomingTx')>=0">
+      <span>Payment Received</span>
+      <div class="wallet-activity-amount">
+      {{x.amountStr}}
+      </div>
+  </div>
+
+  <div ng-if="x.types.indexOf('TxProposalRemoved')>=0">
+    <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
+    Proposal Deleted
+  </div>
+
+  <div ng-if="x.types.indexOf('TxProposalRejected')>=0">
+    <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
+    Proposal Rejected
+  </div>
+
+  <div ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
+    <span ng-if="x.types.indexOf('NewTxProposal')>=0  && x.types.indexOf('NewOutgoingTx')==-1 ">
+      <i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
+
+      {{x.amountStr}}
+      <i>{{x.message}}</i>
+    </span>
+    <span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1  && x.types.indexOf('NewOutgoingTx')==-1">
+      <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
+      Proposal Accepted
+    </span>
+  </div>
+
+
+  <p class="wallet-activity-note">
+<!-- {{x.types}} -->
+    <i class="icon ion-record wallet-activity-note-child" ng-style="{'color':x.wallet.color}"></i>
+    <span ng-if="x.creatorName" class="wallet-activity-note-child">{{ x.creatorName}}@</span>
+    <span class="wallet-activity-note-child">{{x.wallet.name}}</span>
+    <time class="wallet-activity-note-child">{{ x.createdOn * 1000 | amTimeAgo}}</time>
+  </p>
 </span>
-
-
-<span ng-if="x.types.indexOf('TxProposalRemoved')>=0">
-  <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
-  Proposal Deleted
-</span>
-
-<span ng-if="x.types.indexOf('TxProposalRejected')>=0">
-  <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
-  Proposal Rejected
-</span>
-
-<span ng-if="x.types.indexOf('TxProposalRemoved') == -1 && x.types.indexOf('TxProposalRejected') == -1">
-  <span ng-if="x.types.indexOf('NewTxProposal')>=0 ">
-    <i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
-
-    {{x.amountStr}}
-    <i>{{x.message}}</i>
-  </span>
-  <span ng-if="x.types.indexOf('TxProposalAcceptedBy')>=0 && x.types.indexOf('NewTxProposal') == -1 ">
-    <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
-    Proposal Accepted
-  </span>
-</span>
-
-
-<div class="item-note">
-
-<!--  {{x.types}}  -->
-  <time>{{ x.createdOn * 1000 | amTimeAgo}}</time>
-  &middot;
-    <i class="ion-briefcase" ng-style="{'color':x.wallet.color}"></i>
-    <span ng-if="x.creatorName">{{ x.creatorName}}@</span>{{x.wallet.name}}
-</div>
-

public/views/includes/wallets.html

@@ -1,7 +1,7 @@
 <div class="wallets" ng-show="wallets[0]">
   <ion-slides class="slides" slider="data.slider">
     <ion-slide-page ng-repeat="wallet in wallets track by $index">
-      <div class="item item-icon-left">
+      <div class="item item-icon-left item-icon-right">
         <i class="icon ion-briefcase size-21" ng-style="{'color':wallet.color}"></i>
           {{wallet.name || wallet.id}}
         <span class="item-note" ng-show="wallet.n > 1 && wallet.isComplete()">
@@ -10,6 +10,7 @@
         <span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>
           Incomplete
         </span>
+        <i ng-show="wallet.needsBackup" class="icon ion-android-warning assertive"></i>
       </div>
     </ion-slide-page>
   </ion-slides>