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

Merge branch 'master' of https://github.com/bitpay/copay into v3.5.0

Browse source
This commit is contained in:
magmahindenburg 2017-06-16 11:20:33 +09:00
commit 19824e8fde
73 changed files with 200 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,9 +8,7 @@
<div class="tx-title">
<div class="ellipsis">
<div class="tx-message ellipsis">{{tx.merchant.name || 'Unknown Merchant'}}</div>
<!-- Removed to cleanup look and since intl card does not provide location.
<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>