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

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

Browse source 
Wavecrest card compatibility
This commit is contained in:
Gabriel Edgardo Bazán 2017-05-29 12:14:06 -03:00 • committed by GitHub
commit d90b6486ab
2 changed files with 7 additions and 1 deletions
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;