anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1428 from isocolsky/ux/conversion_rate

Browse source 
Ux/conversion rate
This commit is contained in:
Matias Alejo Garcia 2014-09-22 09:54:36 -03:00
commit fb18487b4f
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
js/services/controllerUtils.js
View file

@ -202,8 +202,7 @@ angular.module('copayApp.services')
$rootScope.totalBalanceAlternative = rateService.toFiat(balanceSat, w.settings.alternativeIsoCode);
$rootScope.alternativeIsoCode = w.settings.alternativeIsoCode;
$rootScope.lockedBalanceAlternative = rateService.toFiat(balanceSat - safeBalanceSat, w.settings.alternativeIsoCode);
$rootScope.alternativeConversionRate = rateService.toFiat(100000000, w.settings.alternativeIsoCode);
return cb ? cb() : null;
});
});

10
views/send.html
View file

@ -117,9 +117,15 @@
</div>
</div>
</div>
<div class="row collapse">
<div class="large-5 medium-3 small-6 columns">
<span ng-if="!$root.alternativeConversionRate">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span class="left m5t text-gray size-14" ng-if="$root.alternativeConversionRate > 0">1 BTC = {{alternativeConversionRate|noFractionNumber:2}} {{alternativeIsoCode}}
</span>
<div class="large-5 medium-3 small-6 columns right">
<button type="submit" class="button primary expand text-center" ng-disabled="sendForm.$invalid || loading">
Send
</button>