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

Merge pull request #6680 from matiu/bug/ars

Browse source 
fix non equiv bch
This commit is contained in:
Gustavo Maximiliano Cortez 2017-08-31 18:23:59 -03:00 • committed by GitHub
commit 3107ce5517
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/controllers/amount.js
View file

@ -304,7 +304,14 @@ angular.module('copayApp.controllers').controller('amountController', function($
$scope.globalResult = isExpression($scope.amount) ? '= ' + processResult(result) : '';
if (availableUnits[unitIndex].isFiat) {
$scope.alternativeAmount = txFormatService.formatAmount(fromFiat(result) * unitToSatoshi, true);
var a = fromFiat(result);
if (a) {
$scope.alternativeAmount = txFormatService.formatAmount(a * unitToSatoshi, true);
} else {
$scope.alternativeAmount = 'N/A'; //TODO
$scope.allowSend = false;
}
} else {
$scope.alternativeAmount = $filter('formatFiatAmount')(toFiat(result));
}
@ -321,6 +328,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
};
function toFiat(val) {
if (!rateService.getRate(fiatCode)) return;
return parseFloat((rateService.toFiat(val * unitToSatoshi, fiatCode, availableUnits[unitIndex].id)).toFixed(2));
};