Merge pull request #264 from Bitcoin-com/wallet/sprint/20

Wallet/sprint/20

src/js/directives/formattedAmount.js

@@ -86,7 +86,6 @@
     }
 
     function formatNumbers() {
-      console.log('formatNumbers() "' + $scope.value + '", "' + $scope.currency + '"');
       // Might get "< 0.01 USD" being passed in.
       // During watch, may be changed from having a separate currency value,
       // to both being in value. Don't want to use previous currency value.
@@ -105,6 +104,9 @@
         return;
       }
 
+      // Remove thousands separators for parseFloat()
+      $scope.value = $scope.value.replace(',', '');
+
       var parsed = parseFloat($scope.value);
       var valueFormatted = '';
       var valueProcessing = '';

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>

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>
 

www/views/review.html

@@ -11,8 +11,8 @@
     <div class="header {{vm.origin.currency.toLowerCase()}}" ng-class="vm.thirdParty.id">
       <div class="content">
         <p>{{vm.sendingTitle}}</p>
-        <p class="large">{{vm.primaryAmount}} {{vm.primaryCurrency}}</p>
-        <p ng-show="vm.secondaryAmount">{{vm.secondaryAmount}} {{vm.secondaryCurrency}}</p>
+        <p class="large"><formatted-amount value="{{vm.primaryAmount}}" currency="{{vm.primaryCurrency}}"></formatted-amount></p>
+        <p ng-show="vm.secondaryAmount"><formatted-amount value="{{vm.secondaryAmount}}" currency="{{vm.secondaryCurrency}}"></formatted-amount></p>
       </div>
     </div>
 
@@ -89,7 +89,7 @@
       <div class="fee-fiat positive" ng-if="vm.feeLessThanACent">Fee: Less than 1 cent</div>
       <div class="fee-fiat" ng-class="vm.feeIsHigh ? 'negative' : 'positive'" ng-if="!vm.feeLessThanACent">Fee: {{vm.feeFiat}} {{vm.feeCurrency}}</div>
       <div class="fee-crypto" ng-if="vm.feeCrypto">
-        {{vm.feeCrypto}} {{vm.origin.currency}}
+        <formatted-amount value="{{vm.feeCrypto}}" currency="{{vm.origin.currency}}"></formatted-amount>
       </div>
     </div>
   </div>

www/views/walletDetails.html

@@ -46,7 +46,7 @@
           class="size-14 amount-alternative"
           ng-if="status.totalBalanceStr && wallet.network == 'livenet'"
           ng-style="{opacity: altAmountOpacity}">
-          <formatted-amount value="{{status.totalBalanceStr}}"></formatted-amount>
+          <formatted-amount value="{{status.totalBalanceStr}}" size-equal="true"></formatted-amount>
         </div>
       </div>