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

Refactor code. Fix tx list (for pending and confirming tx)

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-07-12 19:45:15 -03:00
commit a9edb90fbe
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
4 changed files with 155 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,9 @@
<div class="tx-title">
<div class="ellipsis">
<div class="tx-message ellipsis">{{tx.merchant.name || 'Unknown Merchant'}}</div>
<div class="tx-location ellipsis" ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.location}}</div>
<div class="tx-location ellipsis" ng-show="tx.merchant.city && tx.merchant.state">
{{tx.merchant.location}}
</div>
<div ng-show="tx.pending && tx.transactionId" class="size-12 tx-amount--pending">
<div ng-click="bitpayCard.viewOnBlockchain(tx.transactionId)">View Confirmation Status</div>
</div>
@ -19,8 +21,8 @@
{{tx.price | currency:bitpayCard.currencySymbol:2 }}
</span>
<div>
<time class="tx-time" ng-if="createdWithinPastDay(tx)">{{tx.timestamp | amTimeAgo}}</time>
<time class="tx-time" ng-if="!createdWithinPastDay(tx)">{{tx.timestamp | amDateFormat:'MMM D, YYYY'}}</time>
<time class="tx-time" ng-if="createdWithinPastDay(tx)">{{tx.date | amTimeAgo}}</time>
<time class="tx-time" ng-if="!createdWithinPastDay(tx)">{{tx.date | amDateFormat:'MMM D, YYYY'}}</time>
</div>
</span>
</div>