anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #588 from cmgustavo/bug/bitpay-card-activity-atm

Browse source 
Fix activity from BitPay Card
This commit is contained in:
Matias Alejo Garcia 2016-10-20 07:13:17 -03:00 • committed by GitHub
commit e1e9aead1a
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
www/views/bitpayCard.html
View file

@ -61,15 +61,19 @@
ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']" ng-repeat="tx in bitpayCard.bitpayCardTransactionHistory | orderBy: ['pending','-timestamp']"
class="item row"> class="item row">
<div class="col col-10"> <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>
<div class="col col-50"> <div class="col col-50">
<div class="size-12 text-bold"> <div class="size-12 text-bold">
{{tx.merchant.name}} {{tx.merchant.name}}
</div> </div>
<div class="size-12"> <div class="size-10">
{{tx.merchant.city}}, {{tx.merchant.state}} <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>
</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/check.svg" width="14">
<img ng-show="tx.pending" ng-src="img/sync.svg" width="14"> <img ng-show="tx.pending" ng-src="img/sync.svg" width="14">
</div> </div>
<div class="col text-right size-12 text-gray"> <div class="col text-right size-14 text-gray">
<div class="size-14" <div ng-show="tx.fee != '0.00'">{{tx.fee | currency:'$':2}}</div>
<div ng-show="tx.fee == '0.00'"
ng-class="{ ng-class="{
'text-success': tx.amount.indexOf('-') == -1 && !tx.pending, 'text-success': tx.amount.indexOf('-') == -1 && !tx.pending,
'text-gray': tx.amount.indexOf('-') == -1 && tx.pending}"> 'text-gray': tx.amount.indexOf('-') == -1 && tx.pending}">
{{tx.amount | currency:'$':2 }} {{tx.amount | currency:'$':2 }}
</div> </div>
<time ng-if="!tx.pending">{{tx.timestamp | amTimeAgo}}</time> <time class="size-12" ng-if="!tx.pending">{{tx.timestamp | amTimeAgo}}</time>
<span ng-if="tx.pending" class="tu" translate>Pending</span> <span class="size-12" ng-if="tx.pending" class="tu" translate>Pending</span>
</div> </div>
</div> </div>
</div> </div>