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

Fix location and iconName

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2017-07-13 10:23:42 -03:00
commit 7a5d32a269
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/js/controllers/bitpayCard.js
View file

@ -62,8 +62,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
self.bitpayCardTransactionHistoryCompleted = null;
self.bitpayCardTransactionHistoryConfirming = null;
self.bitpayCardTransactionHistoryPreAuth = null;
self.underpaidInvoiceInList = null;
self.delayedInvoiceInList = null;
self.balance = null;
popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not get transactions'));
return;
@ -72,16 +70,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
setGetStarted(history, function() {
var txs = lodash.clone(history.txs);
for (var i = 0; i < txs.length; i++) {
txs[i].icon = _getIconName(txs[i]);
txs[i].desc = _processDescription(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.bitpayCardTransactionHistoryConfirming = bitpayCardService.filterTransactions('confirming', txs);
self.bitpayCardTransactionHistoryCompleted = bitpayCardService.filterTransactions('completed', txs);
@ -110,19 +98,6 @@ angular.module('copayApp.controllers').controller('bitpayCardController', functi
});
};
var _getIconName = function(tx) {
var icon = tx.mcc || tx.category || null;
if (!icon || bitpayCardService.iconMap[icon] == undefined) return 'default';
return bitpayCardService.iconMap[icon];
};
var _processDescription = function(tx) {
if (lodash.isArray(tx.description)) {
return tx.description[0];
}
return tx.description;
};
$scope.createdWithinPastDay = function(tx) {
var result = false;
if (tx.date) {