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

change unit/kB for sat/Byte in fee rate

Browse source
This commit is contained in:
Gabriel Bazán 2017-05-17 16:37:49 -03:00
commit f681122fd6
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/controllers/preferencesFee.js
View file

@ -53,11 +53,11 @@ angular.module('copayApp.controllers').controller('preferencesFeeController', fu
level: $scope.currentFeeLevel level: $scope.currentFeeLevel
}); });
if (lodash.isEmpty(feeLevelValue)) { if (lodash.isEmpty(feeLevelValue)) {
$scope.feePerKBUnit = null; $scope.feePerSatByte = null;
$scope.avgConfirmationTime = null; $scope.avgConfirmationTime = null;
return; return;
} }
$scope.feePerKBUnit = feeLevelValue.feePerKBUnit; $scope.feePerSatByte = (feeLevelValue.feePerKB / 1000).toFixed();
$scope.avgConfirmationTime = feeLevelValue.nbBlocks * 10; $scope.avgConfirmationTime = feeLevelValue.nbBlocks * 10;
}; };
}); });

5
src/js/services/feeService.js
View file

@ -50,12 +50,7 @@ angular.module('copayApp.services').factory('feeService', function($log, $stateP
walletClient.getFeeLevels('testnet', function(errTestnet, levelsTestnet) { walletClient.getFeeLevels('testnet', function(errTestnet, levelsTestnet) {
if (errLivenet || errTestnet) { if (errLivenet || errTestnet) {
return cb(gettextCatalog.getString('Could not get dynamic fee')); return cb(gettextCatalog.getString('Could not get dynamic fee'));
} else {
lodash.each(lodash.union(levelsLivenet, levelsTestnet), function(level) {
level.feePerKBUnit = txFormatService.formatAmount(level.feePerKB) + ' ' + unitName;
});
} }
return cb(null, { return cb(null, {
'livenet': levelsLivenet, 'livenet': levelsLivenet,
'testnet': levelsTestnet 'testnet': levelsTestnet

6
www/views/preferencesFee.html
View file

@ -12,13 +12,13 @@
<div class="settings-description" translate>The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy.</div> <div class="settings-description" translate>The higher the fee, the greater the incentive a miner has to include that transaction in a block. Current fees are determined based on network load and the selected policy.</div>
<div class="estimates"> <div class="estimates">
<div> <div>
<span translate>Average confirmation time</span>: <span translate>Average confirmation time</span>:
<span class="fee-minutes" ng-if="avgConfirmationTime">{{avgConfirmationTime | amDurationFormat: 'minute'}}</span> <span class="fee-minutes" ng-if="avgConfirmationTime">{{avgConfirmationTime | amDurationFormat: 'minute'}}</span>
<span ng-if="loadingFee">...</span> <span ng-if="loadingFee">...</span>
</div> </div>
<div> <div>
<span translate>Current fee rate for this policy</span>: <span translate>Current fee rate for this policy</span>:
<span class="fee-rate" ng-if="feePerKBUnit">{{feePerKBUnit}}/kiB</span> <span class="fee-rate" ng-if="feePerSatByte">{{feePerSatByte}} sat/Byte</span>
<span ng-if="loadingFee">...</span> <span ng-if="loadingFee">...</span>
</div> </div>
</div> </div>