diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js index fccfe9b90..7013c80d3 100644 --- a/src/js/services/feeService.js +++ b/src/js/services/feeService.js @@ -17,17 +17,18 @@ angular.module('copayApp.services').factory('feeService', function($log, profile root.getCurrentFeeValue = function(cb) { var fc = profileService.focusedClient; var feeLevel = root.getCurrentFeeLevel(); - // static fee - var fee = 10000; + fc.getFeeLevels(fc.credentials.network, function(err, levels) { - if (err) { - return cb({message: 'Could not get dynamic fee. Using static 10000sat'}, fee); - } - else { - fee = lodash.find(levels, { level: feeLevel }).feePerKB; - $log.debug('Dynamic fee: ' + feeLevel + ' ' + fee + ' SAT'); - return cb(null, fee); - } + if (err) + return cb({message: 'Could not get dynamic fee'}); + + var feeLevelValue = lodash.find(levels, { level: feeLevel }); + if (!feeLevelValue || ! feeLevelValue.feePerKB) + return cb({message: 'Could not get dynamic fee for level: ' + feeLevel}); + + var fee = feeLevel.feePerKB; + $log.debug('Dynamic fee: ' + feeLevel + ' ' + fee + ' SAT'); + return cb(null, fee); }); }; diff --git a/src/js/services/txService.js b/src/js/services/txService.js index 4b3728bb0..fe78066d0 100644 --- a/src/js/services/txService.js +++ b/src/js/services/txService.js @@ -103,7 +103,8 @@ angular.module('copayApp.services').factory('txService', function($rootScope, pr }; getFee(function(err, feePerKb) { - if (err) $log.debug(err); + if (err) return cb(err); + opts.feePerKb = feePerKb; opts.excludeUnconfirmedUtxos = currentSpendUnconfirmed ? false : true; fc.createTxProposal(opts, function(err, txp) {