Merge pull request #1935 from isocolsky/2_decimals

set 2 decimal places for alternative amount
This commit is contained in:
Matias Alejo Garcia 2014-12-02 18:10:22 -03:00
commit 399f463437
2 changed files with 2 additions and 2 deletions

View File

@ -147,7 +147,7 @@ angular.module('copayApp.controllers').controller('HistoryController',
_.each(res, function(r) {
var tx = index[r.ts];
var alternativeAmount = (r.rate != null ? tx.amountSat * rateService.SAT_TO_BTC * r.rate : null);
tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount) : null;
tx.alternativeAmount = alternativeAmount ? $filter('noFractionNumber')(alternativeAmount, 2) : null;
});
setTimeout(function() {
$scope.$digest();

View File

@ -34,7 +34,7 @@ angular.module('copayApp.controllers').controller('SendController',
rateService.whenAvailable(function() {
_.each(tx.outs, function(out) {
var valueSat = out.valueSat * w.settings.unitToSatoshi;
out.alternativeAmount = $filter('noFractionNumber')(rateService.toFiat(valueSat, $scope.alternativeIsoCode));
out.alternativeAmount = $filter('noFractionNumber')(rateService.toFiat(valueSat, $scope.alternativeIsoCode), 2);
out.alternativeIsoCode = $scope.alternativeIsoCode;
});
if (cb) return cb(tx);