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

Merge pull request #6167 from ajp8164/feat/wc-card-compatibility

Browse source 
Currency and field compatibility with wavecrest card.
This commit is contained in:
Gustavo Maximiliano Cortez 2017-06-05 11:37:54 -03:00 • committed by GitHub
commit 8b28e708bc
5 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/views/bitpayCard.html
View file

@ -15,7 +15,7 @@
<div class="amount-bg"></div>
<div class="amount">
<div ng-if="bitpayCard.balance" ng-click="bitpayCard.update()">
<div class="amount__balance">${{bitpayCard.balance}}</div>
<div class="amount__balance">{{bitpayCard.currencySymbol}}{{bitpayCard.balance}}</div>
<div class="size-12 m5r" ng-if="bitpayCard.updatedOn">
{{bitpayCard.updatedOn * 1000 | amTimeAgo}}

2
www/views/includes/bitpayCardsCard.html
View file

@ -12,7 +12,7 @@
<div class="bg icon-bitpay-card"></div>
</i>
<span>BitPay Visa&reg; Card ({{card.lastFourDigits}})</span>
<p>{{card.balance ? '$' + card.balance : 'Add funds to get started'|translate}} {{card.updatedOn ? (' &middot; ' + (card.updatedOn * 1000 | amTimeAgo)) : ''}}</p>
<p>{{card.balance ? card.currencySymbol + card.balance : 'Add funds to get started'|translate}} {{card.updatedOn ? (' &middot; ' + (card.updatedOn * 1000 | amTimeAgo)) : ''}}</p>
<i class="icon bp-arrow-right"></i>
</a>
</div>

4
www/views/includes/cardActivity.html
View file

@ -35,9 +35,9 @@
'balanced': tx.price.toString().indexOf('-') == -1 && !tx.pending,
'text-gray': tx.price.toString().indexOf('-') == -1 && tx.pending}">
<span ng-show="tx.price.toString().indexOf('-') == -1">+ </span>
{{tx.price | currency:'$':2 }}
{{tx.price | currency:bitpayCard.currencySymbol:2 }}
</div>
<time class="size-12 text-gray" ng-if="!tx.pending">{{tx.runningBalance | currency:'$':2}}</time>
<time class="size-12 text-gray" ng-if="!tx.pending">{{tx.runningBalance | currency:bitpayCard.currencySymbol:2}}</time>
<span class="size-12 text-gray text-italic" ng-if="tx.pending" class="tu" translate>Pending</span>
</div>
</div>