BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6117 from ajp8164/feat/wavecrest-card-compatibility 

Wavecrest card compatibility
This commit is contained in:
Gabriel Edgardo Bazán 2017-05-29 12:14:06 -03:00 committed by GitHub
parent b61944a510 fca7906f76
commit d90b6486ab
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/controllers/bitpayCard.js
View File

@ -77,6 +77,12 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
txs[i].price = _price(txs[i]);
txs[i].runningBalance = runningBalance;
_runningBalance(txs[i]);
if (txs[i].merchant.city && txs[i].merchant.state) {
txs[i].merchant.location = txs[i].merchant.city + ', ' + txs[i].merchant.state;
} else {
txs[i].merchant.location = txs[i].merchant.city || txs[i].merchant.state || '';
}
}
self.bitpayCardTransactionHistory = txs;
self.balance = history.currentCardBalance;

2
www/views/bitpayCard.html
View File

@ -79,7 +79,7 @@
{{tx.merchant.name || 'Unknown Merchant'}}
</div>
<div class="size-12 text-gray">
<span ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.city}}, {{tx.merchant.state}}</span>
<span ng-show="tx.merchant.city && tx.merchant.state">{{tx.merchant.location}}</span>
<span ng-class="{'m5l':tx.merchant.city && tx.merchant.state}">
{{tx.timestamp | amDateFormat:'h:mm A'}}
</span>