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

fix non equiv bch

Browse source
This commit is contained in:
matiu 2017-08-31 18:16:50 -03:00
commit d074a7da7f
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));
};

3
www/views/amount.html
View file

@ -52,7 +52,8 @@
</div>
<div ng-class="{'amount__results--minimize': smallFont, 'amount__results--standard': !smallFont, 'amount__results--placeholder': amountResult}" ng-click="changeAlternativeUnit()">
<div class="amount__result" ng-show="globalResult">{{globalResult}} {{unit}}</div>
<div class="amount__result-equiv">&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</div>
<div class="amount__result-equiv" ng-show="alternativeAmount">&asymp; {{alternativeAmount || '0.00'}} {{alternativeUnit}}</div>
<div class="amount__result-equiv" ng-show="!alternativeAmount">&nbsp;</div>
</div>
</div>
</div>