mirror of https://github.com/BTCPrivate/copay.git
Default static fee if using old bws
This commit is contained in:
parent
2cc9554df4
commit
0b34e1d1b5
|
@ -399,14 +399,13 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="text-right size-12 m10b" ng-if="index.feeLevels.livenet && index.feeLevels.testnet">
|
||||
<div class="text-right size-12 m20b" ng-if="index.feeLevels.livenet && index.feeLevels.testnet">
|
||||
<span ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
|
||||
ng-show="index.currentFeeLevel == fee.level">
|
||||
<span translate>Fee</span>:
|
||||
<span class="text-light" translate>{{fee.feePerKBUnit}} per kB</span>
|
||||
(<span translate>Average confirmation time: {{fee.nbBlocks * 10}} minutes</span>)
|
||||
ng-show="index.currentFeeLevel == fee.level" class="pointer" ng-click="home.openFeeLevelsModal(index.feeLevels, index.currentFeeLevel)">
|
||||
<span translate>Fee level: {{fee.level}}</span>
|
||||
<span class="text-gray">({{fee.feePerKBUnit}}/KB)</span>
|
||||
<i class="fi-pencil"></i>
|
||||
</span>
|
||||
<a href ng-click="home.openFeeLevelsModal(index.feeLevels, index.currentFeeLevel)" translate>Change</a>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
|
|
|
@ -725,11 +725,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
|
|||
amount = parseInt((form.amount.$modelValue * unitToSat).toFixed(0));
|
||||
|
||||
feeService.getCurrentFeeValue(function(err, feePerKb) {
|
||||
if (err) {
|
||||
self.setOngoingProcess();
|
||||
profileService.lockFC();
|
||||
return self.setSendError(err);
|
||||
}
|
||||
if (err) $log.debug(err);
|
||||
fc.sendTxProposal({
|
||||
toAddress: address,
|
||||
amount: amount,
|
||||
|
|
|
@ -11,7 +11,7 @@ angular.module('copayApp.services').factory('feeService', function($log, lodash,
|
|||
var fee = 10000;
|
||||
fc.getFeeLevels(fc.credentials.network, function(err, levels) {
|
||||
if (err) {
|
||||
return cb({message: 'Error getting dynamic fee'})
|
||||
return cb({message: 'Error getting dynamic fee'}, fee);
|
||||
}
|
||||
else {
|
||||
for (var i = 0; i < 3; i++) {
|
||||
|
@ -52,7 +52,7 @@ angular.module('copayApp.services').factory('feeService', function($log, lodash,
|
|||
|
||||
fc.getFeeLevels('livenet', function(errLivenet, levelsLivenet) {
|
||||
fc.getFeeLevels('testnet', function(errTestnet, levelsTestnet) {
|
||||
if (errLivenet || errTestnet) $log.error('Error getting dynamic fee');
|
||||
if (errLivenet || errTestnet) $log.debug('Error getting dynamic fee');
|
||||
|
||||
for (var i = 0; i < 3; i++) {
|
||||
levelsLivenet[i]['feePerKBUnit'] = profileService.formatAmount(levelsLivenet[i].feePerKB) + ' ' + unitName;
|
||||
|
|
Loading…
Reference in New Issue