From 429e9c8446ca0d2db2e1b3ee5575e0218641c3b7 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Wed, 23 May 2018 18:04:42 -0700 Subject: [PATCH] In Recent Transactions it displays the crypto amount if the fiat display setting is selected but the fiat amount is not ready yet. --- src/js/services/profileService.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/js/services/profileService.js b/src/js/services/profileService.js index ecf761b53..dac88169f 100644 --- a/src/js/services/profileService.js +++ b/src/js/services/profileService.js @@ -933,15 +933,13 @@ angular.module('copayApp.services') x.types = [x.type]; if (x.data && x.data.amount) { - x.amountStr = null; // Will have loading state in view + // 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; - // Will I need an apply() after this? }); - } else { - x.amountStr = txFormatService.formatAmountStr(x.wallet.coin, x.data.amount); } }); }