diff --git a/js/controllers/more.js b/js/controllers/more.js index 48fe1103b..5af6313a9 100644 --- a/js/controllers/more.js +++ b/js/controllers/more.js @@ -34,7 +34,7 @@ angular.module('copayApp.controllers').controller('MoreController', name: w.settings.alternativeName, isoCode: w.settings.alternativeIsoCode }; - $scope.alternativeOpts = rateService.isAvailable ? + $scope.alternativeOpts = rateService.isAvailable() ? rateService.listAlternatives() : [$scope.selectedAlternative]; rateService.whenAvailable(function() { diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index 610e331ee..a351db6cb 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -278,15 +278,18 @@ angular.module('copayApp.services') } r.balanceByAddr = balanceByAddr; root.updateAddressList(); - r.updatingBalance = false; - rateService.whenAvailable(function() { + if (rateService.isAvailable()) { r.totalBalanceAlternative = rateService.toFiat(balanceSat, w.settings.alternativeIsoCode); r.alternativeIsoCode = w.settings.alternativeIsoCode; r.lockedBalanceAlternative = rateService.toFiat(balanceSat - safeBalanceSat, w.settings.alternativeIsoCode); r.alternativeConversionRate = rateService.toFiat(100000000, w.settings.alternativeIsoCode); - return cb(null, r) - }); + r.alternativeBalanceAvailable = true; + }; + + r.updatingBalance = false; + + return cb(null, r) }); }; diff --git a/views/homeWallet.html b/views/homeWallet.html index 5183b835c..1875b814b 100644 --- a/views/homeWallet.html +++ b/views/homeWallet.html @@ -20,9 +20,9 @@ - {{totalBalanceAlternative |noFractionNumber:2}} + {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}} + N/A - {{alternativeIsoCode}} diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index 8cb8396f4..f3ecef8b6 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -15,7 +15,8 @@
{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}} - {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}} + {{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}} + N/A