diff --git a/src/js/directives/walletBalanceDirective.js b/src/js/directives/walletBalanceDirective.js index a13d30a98..5b2a41b6c 100644 --- a/src/js/directives/walletBalanceDirective.js +++ b/src/js/directives/walletBalanceDirective.js @@ -17,8 +17,7 @@ } }); - function walletBalanceController($log, $scope, $timeout, uxLanguage) { - console.log('walletBalanceController'); + function walletBalanceController($log, $scope, txFormatService) { var cryptoBalanceHasBeenDisplayed = false; formatBalance(); @@ -29,7 +28,7 @@ function displayCryptoBalance(wallet) { console.log('displayCryptoBalance()'); - if (wallet.status && wallet.status.totalBalanceStr) { + if (wallet.status && wallet.status.isValid && wallet.status.totalBalanceStr) { setDisplay(wallet.status.totalBalanceStr, ''); cryptoBalanceHasBeenDisplayed = true; return; @@ -40,7 +39,7 @@ return; } - if (wallet.cachedStatus && wallet.cachedStatus.totalBalanceStr) { + if (wallet.cachedStatus && wallet.status.isValid && wallet.cachedStatus.totalBalanceStr) { setDisplay(wallet.cachedStatus.totalBalanceStr, ''); return; } @@ -50,13 +49,13 @@ function displayFiatBalance(wallet) { var displayAmount = ''; - if (wallet.status && wallet.status.alternativeBalanceAvailable) { + if (wallet.status && wallet.status.isValid && wallet.status.alternativeBalanceAvailable) { displayAmount = wallet.status.totalBalanceAlternative + ' ' + wallet.status.alternativeIsoCode; setDisplay(displayAmount, ''); return; } - if (wallet.cachedStatus && wallet.cachedStatus.alternativeBalanceAvailable) { + if (wallet.cachedStatus && wallet.cachedStatus.isValid && wallet.cachedStatus.alternativeBalanceAvailable) { displayAmount = wallet.cachedStatus.totalBalanceAlternative + ' ' + wallet.cachedStatus.alternativeIsoCode; setDisplay(displayAmount, ''); return; @@ -66,27 +65,36 @@ } function formatBalance() { - //console.log('formatBalance() with wallet:', $scope.wallet,); - console.log('formatBalance() with displayAsFiat: "' + $scope.displayAsFiat + '"'); + var displayAsFiat = $scope.displayAsFiat === 'true'; var wallet = null; try { wallet = JSON.parse($scope.wallet); } catch (e) { $log.error('Error parsing wallet to display balance.', e); - $scope.displayAmount = ''; - $scope.cachedBalanceUpdatedOn = ''; + setDisplay('', ''); + return; } - if (!$scope.displayAsFiat || $scope.displayAsFiat && !cryptoBalanceHasBeenDisplayed) { + if (!displayAsFiat || displayAsFiat && !cryptoBalanceHasBeenDisplayed) { displayCryptoBalance(wallet); } - if ($scope.displayAsFiat) { + if (displayAsFiat) { displayFiatBalance(wallet); } } function getFiatBalance(wallet) { + if (!(wallet.status && wallet.status.isValid)) { + $log.warn('Abandoning call to get fiat balance, because no valid wallet status.'); + return; + } + + txFormatService.formatAlternativeStr(wallet.coin, wallet.status.totalBalanceSat, function onFormatAlernativeStr(formatted) { + if (formatted) { + setDisplay(formatted, ''); + } + }); } function setDisplay(amount, cachedBalanceUpdatedOn) { diff --git a/www/views/includes/wallet-balance.html b/www/views/includes/wallet-balance.html index 03baa8cac..0818bf343 100644 --- a/www/views/includes/wallet-balance.html +++ b/www/views/includes/wallet-balance.html @@ -1,3 +1,3 @@