From 18c8f4cf07929d0cab601964ded35f7cf2ff78f5 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Fri, 10 Aug 2018 14:17:42 +1200
Subject: [PATCH 1/2] formatted-amount for transaction proposals and wallet
 activity.

---
 www/views/includes/txp.html            |  2 +-
 www/views/includes/walletActivity.html | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/www/views/includes/txp.html b/www/views/includes/txp.html
index 4a1f07aaf..82391bfa2 100644
--- a/www/views/includes/txp.html
+++ b/www/views/includes/txp.html
@@ -24,7 +24,7 @@
       (possible double spend)
       </span>
       <span ng-if="tx.action != 'invalid'">
-      – {{tx.amountStr}}
+      – <formatted-amount value={{tx.amountStr}}></formatted-amount>
       </span>
     </span>
     <div>
diff --git a/www/views/includes/walletActivity.html b/www/views/includes/walletActivity.html
index 3a2b78ab1..e1fdb504f 100644
--- a/www/views/includes/walletActivity.html
+++ b/www/views/includes/walletActivity.html
@@ -10,7 +10,7 @@
   <div ng-if="notification.type == 'NewOutgoingTx'">
       <span translate>Payment Sent </span>
       <div class="wallet-activity-amount">
-      {{notification.amountStr}}
+        <formatted-amount value={{notification.amountStr}}
       </div>
   </div>
 
@@ -19,7 +19,7 @@
   <div ng-if="notification.type == 'NewIncomingTx'">
       <span translate>Payment Received</span>
       <div class="wallet-activity-amount">
-      {{notification.amountStr}}
+         <formatted-amount value={{notification.amountStr}}></formatted-amount>
       </div>
   </div>
 
@@ -27,7 +27,7 @@
     <span translate>Proposal Deleted</span>:
     <b>{{notification.message}}</b>
     <div class="wallet-activity-amount">
-      {{notification.amountStr}}:
+      <formatted-amount value={{notification.amountStr}}></formatted-amount>:
     </div>
   </div>
 
@@ -35,7 +35,7 @@
     <span translate>Proposal Rejected</span>:
     <b>{{notification.message}}</b>
     <div class="wallet-activity-amount">
-      {{notification.amountStr}}:
+      <formatted-amount value={{notification.amountStr}}></formatted-amount>:
       </div>
   </div>
 
@@ -43,7 +43,7 @@
     <span translate>New Proposal</span>:
     <b>{{notification.message}}</b>
     <div class="wallet-activity-amount">
-    {{notification.amountStr}}
+      <formatted-amount value={{notification.amountStr}}></formatted-amount>
     </div>
   </span>
 
@@ -51,7 +51,7 @@
     <span translate>Proposal Accepted</span>:
     <b>{{notification.message}}</b>
     <div class="wallet-activity-amount">
-    {{notification.amountStr}}
+      <formatted-amount value={{notification.amountStr}}></formatted-amount>
     </div>
   </span>
 

From 4dd334087b6f84537c3e7d05a772acd5279a2df3 Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Fri, 10 Aug 2018 14:24:41 +1200
Subject: [PATCH 2/2] Removed formatted amount from the entry of the Amount
 screen as it was causing a bug.

---
 www/views/amount.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/views/amount.html b/www/views/amount.html
index 8d263eae3..ab56052ab 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -16,12 +16,12 @@
               <div class="primary-amount"
                 ng-class="{long: vm.amount.length > 5, 'very-long': vm.amount.length > 10}">
                 <span class="primary-amount-display text-selectable">
-                  <formatted-amount value="{{vm.amount || '0'}}" currency="{{vm.unit}}"></formatted-amount>
+                  {{vm.amount || '0'}} {{vm.unit}}
                 </span>
               </div>
               <span ng-show="vm.globalResult"><formatted-amount value="{{vm.globalResult}}" currency="{{vm.unit}}"></formatted-amount></span>
               <div class="alternative-amount">
-                <span class="text-selectable"><formatted-amount value="{{vm.alternativeAmount || '0.00'}}" currency="{{vm.alternativeUnit}}"></formatted-amount></span>
+                {{vm.alternativeAmount || '0.00'}} {{vm.alternativeUnit}}
               </div>
               <div class="switch-currencies" ng-click="vm.changeUnit()"><img src="img/icon-convert.svg"></div>
             </div>