txp at home

public/views/includes/txp.html

@@ -0,0 +1,23 @@
+<i class="icon ion-ios-circle-filled" ng-show="tx.pendingForUs" ng-style="{'color':tx.wallet.color}"></i>
+<span ng-show="!tx.merchant">
+  <span ng-show="addressbook[tx.toAddress] && !tx.message">
+    {{addressbook[tx.toAddress]}}
+  </span>
+  <span class="ellipsis" ng-show="!addressbook[tx.toAddress] && tx.message">
+    {{tx.message}}
+  </span>
+  <span ng-show="!addressbook[tx.toAddress] && !tx.message" translate>
+    Sending
+  </span>
+</span>
+<span ng-show="tx.merchant">
+  <span ng-show="tx.merchant.pr.ca"><i class="fi-lock"></i> {{tx.merchant.domain}}</span>
+  <span ng-show="!tx.merchant.pr.ca"><i class="fi-unlock"></i> {{tx.merchant.domain}}</span>
+</span>
+<span>
+  - {{tx.amountStr}}
+</span>
+<div class="item-note">
+  {{tx.wallet.name}} &middot; <time>{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
+</div>
+

public/views/includes/walletActivity.html

@@ -1,5 +1,4 @@
 <span class="wallet-activity">
-
   <div ng-if="x.type ==  'NewCopayer' && x.wallet.n>1">
     Copayer joined 
   </div>
@@ -25,36 +24,32 @@
   </div>
 
   <div ng-if="x.type == 'TxProposalRemoved'">
-    <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
     <span translate>Proposal Deleted</span>: 
-    <i>{{x.message}}</i>
+    <b>{{x.message}}</b>
     <div class="wallet-activity-amount">
       {{x.amountStr}}:
     </div>
   </div>
 
-  <div ng-if="x.type == 'TxProposalRejected'">
-    <i class="icon ion-ios-close-empty size-21" ng-style="{'color':x.wallet.color}"></i>
+  <div ng-if="x.type == 'TxProposalRejectedBy'">
     <span translate>Proposal Rejected</span>:
-    <i>{{x.message}}</i>
+    <b>{{x.message}}</b>
     <div class="wallet-activity-amount">
       {{x.amountStr}}:
       </div>
   </div>
 
   <span ng-if="x.type == 'NewTxProposal'">
-    <i class="icon ion-arrow-up-c size-21" ng-style="{'color':x.wallet.color}"></i>
     <span translate>New Proposal</span>:
-    <i>{{x.message}}</i>
+    <b>{{x.message}}</b>
     <div class="wallet-activity-amount">
     {{x.amountStr}} 
     </div>
   </span>
 
   <span ng-if="x.type == 'TxProposalAcceptedBy'">
-    <i class="icon ion-checkmark-round size-21" ng-style="{'color':x.wallet.color}"></i>
-    <span translate>Proposal Accepted</span>
-    <i>{{x.message}}</i>
+    <span translate>Proposal Accepted</span>:
+    <b>{{x.message}}</b>
     <div class="wallet-activity-amount">
     {{x.amountStr}}
     </div>