From 5b1e5ec5b745ad2ac68d6572b49a95b04b73e872 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 19 Oct 2016 10:32:47 -0300
Subject: [PATCH 1/2] Fix activity from BitPay Card

---
 www/views/bitpayCard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html
index 168b1c905..62f3abfd4 100644
--- a/www/views/bitpayCard.html
+++ b/www/views/bitpayCard.html
@@ -68,7 +68,7 @@
           <div class="size-12 text-bold">
             {{tx.merchant.name}}
           </div>
-          <div class="size-12">
+          <div class="size-12" ng-show="tx.merchant.city && tx.merchant.state">
             {{tx.merchant.city}}, {{tx.merchant.state}}
           </div>
         </div>

From f595c5072bda30611d9e45b72a1e77f69e173d40 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Wed, 19 Oct 2016 10:51:29 -0300
Subject: [PATCH 2/2] Fix history view from BitPay Card

---
 www/views/bitpayCard.html | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/www/views/bitpayCard.html b/www/views/bitpayCard.html
index 62f3abfd4..1a19424cc 100644
--- a/www/views/bitpayCard.html
+++ b/www/views/bitpayCard.html
@@ -61,15 +61,19 @@
         ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']"
         class="item row">
         <div class="col col-10">
-          <img class="m5t" ng-src="img/mcc-icons/{{tx.icon}}.svg" width="22">
+          <img class="m5t" ng-src="img/mcc-icons/{{tx.icon}}.svg" width="28">
         </div>
 
         <div class="col col-50">
           <div class="size-12 text-bold">
             {{tx.merchant.name}}
           </div>
-          <div class="size-12" ng-show="tx.merchant.city && tx.merchant.state">
-            {{tx.merchant.city}}, {{tx.merchant.state}}
+          <div class="size-10">
+            <span ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.city}}, {{tx.merchant.state}}</span>
+            <span ng-show="tx.desc">
+              <span ng-show="tx.merchant.city && tx.merchant.state"> - </span>
+              {{tx.desc}}
+            </span>
           </div>
         </div>
         <!--
@@ -81,15 +85,16 @@
           <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-12 text-gray">
-          <div class="size-14"
+        <div class="col text-right size-14 text-gray">
+          <div ng-show="tx.fee != '0.00'">{{tx.fee | currency:'$':2}}</div>
+          <div ng-show="tx.fee == '0.00'"
                ng-class="{
                'text-success': tx.amount.indexOf('-') == -1 && !tx.pending,
                'text-gray': tx.amount.indexOf('-') == -1 && tx.pending}">
             {{tx.amount | currency:'$':2 }}
           </div>
-          <time ng-if="!tx.pending">{{tx.timestamp | amTimeAgo}}</time>
-          <span ng-if="tx.pending" class="tu" translate>Pending</span>
+          <time class="size-12" ng-if="!tx.pending">{{tx.timestamp | amTimeAgo}}</time>
+          <span class="size-12" ng-if="tx.pending" class="tu" translate>Pending</span>
         </div>
       </div>
     </div>