diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js index 143536504..03b1eaff5 100644 --- a/js/services/controllerUtils.js +++ b/js/services/controllerUtils.js @@ -2,7 +2,7 @@ var bitcore = require('bitcore'); angular.module('copayApp.services') - .factory('controllerUtils', function($rootScope, $sce, $location, notification, $timeout, video, uriHandler) { + .factory('controllerUtils', function($rootScope, $sce, $location, notification, $timeout, video, uriHandler, rateService) { var root = {}; root.getVideoMutedStatus = function(copayer) { if (!$rootScope.videoInfo) return; @@ -217,7 +217,15 @@ angular.module('copayApp.services') $rootScope.balanceByAddr = balanceByAddr; root.updateAddressList(); $rootScope.updatingBalance = false; - return cb ? cb() : null; + + rateService.whenAvailable(function() { + $rootScope.totalBalanceAlternative = rateService.toFiat(balanceSat, config.alternativeIsoCode); + $rootScope.alternativeIsoCode = config.alternativeIsoCode; + $rootScope.lockedBalanceAlternative = rateService.toFiat(balanceSat - safeBalanceSat, config.alternativeIsoCode); + + + return cb ? cb() : null; + }); }); }; diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index a22bb2475..c0b942533 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -24,10 +24,9 @@ class="has-tip" data-options="disable_for_touch:true" tooltip-popup-delay='500' - tooltip="{{totalBalanceBTC |noFractionNumber:8}} BTC" + tooltip="{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}" tooltip-trigger="mouseenter" - tooltip-placement="bottom">{{totalBalance || 0 - |noFractionNumber}} {{$root.unitName}} + tooltip-placement="bottom">{{totalBalance || 0 |noFractionNumber}} {{$root.unitName}}
Locked   @@ -38,7 +37,7 @@ class="has-tip" data-options="disable_for_touch:true" tooltip-popup-delay='500' - tooltip="{{lockedBalanceBTC |noFractionNumber:8}} BTC" + tooltip="{{lockedBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}" tooltip-trigger="mouseenter" tooltip-placement="bottom">{{lockedBalance || 0|noFractionNumber}} {{$root.unitName}}