Merge pull request #145 from Bitcoin-com/wallet/task/319

Wallet/task/319
This commit is contained in:
Jean-Baptiste Dominguez 2018-05-25 11:50:30 +09:00 committed by GitHub
commit 706ba298fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 40 additions and 9 deletions

View file

@ -932,8 +932,17 @@ angular.module('copayApp.services')
x.txid = x.data ? x.data.txid : null;
x.types = [x.type];
if (x.data && x.data.amount)
if (x.data && x.data.amount) {
// Default to showing amount in crypto because we have that now
x.amountStr = txFormatService.formatAmountStr(x.wallet.coin, x.data.amount);
configService.whenAvailable(function(config) {
if (config.wallet.settings.priceDisplay === "fiat") {
txFormatService.formatAlternativeStr(x.wallet.coin, x.data.amount, function(formattedString) {
x.amountStr = formattedString;
});
}
});
}
x.action = function() {
// TODO?