Merge pull request #649 from cmgustavo/bug/bitpay-card-tx-list

Ref BitPay Card TX list

src/js/controllers/bitpayCard.js

@@ -3,6 +3,7 @@
 angular.module('copayApp.controllers').controller('bitpayCardController', function($scope, $timeout, $log, $state, lodash, bitpayCardService, moment, popupService, gettextCatalog, $ionicHistory) {
 
   var self = this;
+  var runningBalance;
   $scope.dateRange = { value: 'last30Days'};
   $scope.network = bitpayCardService.getEnvironment();
 
@@ -68,10 +69,14 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
         self.getStarted = getStarted;
 
         var txs = lodash.clone(history.txs);
+        runningBalance = parseFloat(history.endingBalance);
         for (var i = 0; i < txs.length; i++) {
           txs[i] = _getMerchantInfo(txs[i]);
           txs[i].icon = _getIconName(txs[i]);
           txs[i].desc = _processDescription(txs[i]);
+          txs[i].price = _price(txs[i]);
+          txs[i].runningBalance = runningBalance;
+          _runningBalance(txs[i]);
         }
         self.bitpayCardTransactionHistory = txs;
         self.bitpayCardCurrentBalance = history.currentCardBalance;
@@ -117,6 +122,14 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
     return tx.description;
   };
 
+  var _price = function(tx) {
+    return parseFloat(tx.amount) + parseFloat(tx.fee)
+  };
+
+  var _runningBalance = function(tx) {
+    runningBalance -= parseFloat(tx.amount);
+  };
+
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     $scope.cardId = data.stateParams.id;
     if (!$scope.cardId) {

src/sass/shame.scss

@@ -401,6 +401,14 @@ input[type=number] {
   font-weight: 700;
 }
 
+.text-gray {
+  color: gray;
+}
+
+.text-italic {
+  font-style: italic;
+}
+
 .no-border {
   border-style: none;
   background-color: transparent !important;

src/sass/views/bitpayCard.scss

@@ -34,4 +34,7 @@
     padding: 0;
     width: 100%;
   }
+  .item-select select {
+    color: #667;
+  }
 }

www/views/bitpayCard.html

@@ -4,8 +4,8 @@
     </ion-nav-back-button>
     <ion-nav-title>BitPay Visa<sup>&reg;</sup> Card</ion-nav-title>
     <ion-nav-buttons side="secondary">
-      <button class="button back-button" ng-show="!error" ui-sref="tabs.bitpayCard.preferences">
+      <button class="button no-border" ng-show="!error" ui-sref="tabs.bitpayCard.preferences">
-        <i class="icon ion-ios-gear-outline"></i>
+        <i class="icon ion-ios-settings"></i>
       </button>
     </ion-nav-buttons>
   </ion-nav-bar>
@@ -20,10 +20,11 @@
       <div class="amount">
         <div ng-if="bitpayCard.bitpayCardCurrentBalance" ng-click="bitpayCard.update()">
           <div class="size-36 m20b">${{bitpayCard.bitpayCardCurrentBalance}}</div>
-          <a class="button button-primary button-small"
+          <a class="button button-primary button-small m5t size-14"
-            style="padding-left: 1em; padding-right: 1em;"
+            style="padding: 0.5em 1em;"
-            ui-sref="tabs.bitpayCard.amount({'cardId': cardId, 'toName': 'BitPay Card'})" translate>
+            ui-sref="tabs.bitpayCard.amount({'cardId': cardId, 'toName': 'BitPay Card'})">
-            Add Funds
+            <i class="icon ion-plus m10r" style="vertical-align: baseline;"></i>
+            {{'Add Funds'|translate}}
           </a>
         </div>
         <div ng-if="!bitpayCard.bitpayCardCurrentBalance" class="m10t">
@@ -61,19 +62,22 @@
       <div ng-if="bitpayCard.bitpayCardTransactionHistory[0]"
         ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']"
         class="item row">
+        <div class="col col-10 text-center">
+          <div class="tu size-12">{{tx.timestamp | amDateFormat:'MMM'}}</div>
+          <div class="text-light">{{tx.timestamp | amDateFormat:'DD'}}</div>
+        </div>
         <div class="col col-10">
-          <img class="m5t" ng-src="img/mcc-icons/{{tx.icon}}.svg" width="28">
+          <img class="m15t" ng-src="img/mcc-icons/{{tx.icon}}.svg" width="24">
         </div>
 
         <div class="col col-50">
           <div class="size-12 text-bold">
             {{tx.merchant.name}}
           </div>
-          <div class="size-10">
+          <div class="size-12 text-gray">
             <span ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.city}}, {{tx.merchant.state}}</span>
-            <span ng-show="tx.desc">
+            <span ng-class="{'m5l':tx.merchant.city && tx.merchant.state}">
-              <span ng-show="tx.merchant.city && tx.merchant.state"> - </span>
+              {{tx.timestamp | amDateFormat:'h:mm A'}}
-              {{tx.desc}}
             </span>
           </div>
         </div>
@@ -81,21 +85,20 @@
         <div class="col size-12">
           {{tx.desc}}
         </div>
-        -->
         <div class="col col-10 text-center p10t">
           <img ng-show="!tx.pending" ng-src="img/check.svg" width="14">
           <img ng-show="tx.pending" ng-src="img/sync.svg" width="14">
         </div>
-        <div class="col text-right size-14 text-gray">
+        -->
-          <div ng-show="tx.fee != '0.00'">{{tx.fee | currency:'$':2}}</div>
+        <div class="col text-right">
-          <div ng-show="tx.fee == '0.00'"
+          <div ng-class="{
-               ng-class="{
+               'balanced': tx.price.toString().indexOf('-') == -1 && !tx.pending,
-               'text-success': tx.amount.indexOf('-') == -1 && !tx.pending,
+               'stable': tx.price.toString().indexOf('-') == -1 && tx.pending}">
-               'text-gray': tx.amount.indexOf('-') == -1 && tx.pending}">
+            <span ng-show="tx.price.toString().indexOf('-') == -1 && !tx.pending">+ </span>
-            {{tx.amount | currency:'$':2 }}
+            {{tx.price | currency:'$':2 }}
           </div>
-          <time class="size-12" ng-if="!tx.pending">{{tx.timestamp | amTimeAgo}}</time>
+          <time class="size-12 text-gray" ng-if="!tx.pending">{{tx.runningBalance | currency:'$':2}}</time>
-          <span class="size-12" ng-if="tx.pending" class="tu" translate>Pending</span>
+          <span class="size-12 text-gray text-italic" ng-if="tx.pending" class="tu" translate>Pending</span>
         </div>
       </div>
     </div>