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

use correct format amount str

Browse source
This commit is contained in:
Javier 2016-11-29 12:02:10 -03:00
commit 88b2ed63ff
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/controllers/confirm.js
View file

@ -153,10 +153,9 @@ angular.module('copayApp.controllers').controller('confirmController', function(
}; };
cachedSendMax[$scope.wallet.id] = $scope.sendMaxInfo; cachedSendMax[$scope.wallet.id] = $scope.sendMaxInfo;
var unitName = config.settings.unitName;
var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", { var msg = gettextCatalog.getString("{{fee}} will be deducted for bitcoin networking fees", {
fee: txFormatService.formatAmount(resp.fee) + ' ' + unitName fee: txFormatService.formatAmountStr(resp.fee)
}); });
var warningMsg = verifyExcludedUtxos(); var warningMsg = verifyExcludedUtxos();
@ -177,13 +176,13 @@ angular.module('copayApp.controllers').controller('confirmController', function(
var warningMsg = []; var warningMsg = [];
if (resp.utxosBelowFee > 0) { if (resp.utxosBelowFee > 0) {
warningMsg.push(gettextCatalog.getString("A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided.", { warningMsg.push(gettextCatalog.getString("A total of {{amountBelowFeeStr}} were excluded. These funds come from UTXOs smaller than the network fee provided.", {
amountBelowFeeStr: txFormatService.formatAmount(resp.amountBelowFee) + ' ' + unitName amountBelowFeeStr: txFormatService.formatAmountStr(resp.amountBelowFee)
})); }));
} }
if (resp.utxosAboveMaxSize > 0) { if (resp.utxosAboveMaxSize > 0) {
warningMsg.push(gettextCatalog.getString("A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded", { warningMsg.push(gettextCatalog.getString("A total of {{amountAboveMaxSizeStr}} were excluded. The maximum size allowed for a transaction was exceeded", {
amountAboveMaxSizeStr: txFormatService.formatAmount(resp.amountAboveMaxSize) + ' ' + unitName amountAboveMaxSizeStr: txFormatService.formatAmountStr(resp.amountAboveMaxSize)
})); }));
} }
return warningMsg.join('\n'); return warningMsg.join('\n');
@ -202,7 +201,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
$scope.displayAmount = txFormatService.formatAmount(data.amount, true); $scope.displayAmount = txFormatService.formatAmount(data.amount, true);
$scope.displayUnit = unitName; $scope.displayUnit = unitName;
$scope.fee = txFormatService.formatAmount(data.fee) + ' ' + unitName; $scope.fee = txFormatService.formatAmountStr(data.fee);
toAmount = parseFloat((data.amount * satToUnit).toFixed(unitDecimals)); toAmount = parseFloat((data.amount * satToUnit).toFixed(unitDecimals));
txFormatService.formatAlternativeStr(data.amount, function(v) { txFormatService.formatAlternativeStr(data.amount, function(v) {
$scope.alternativeAmountStr = v; $scope.alternativeAmountStr = v;