diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 03f1a3f29..0350163a6 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -399,14 +399,13 @@
-
+
- Fee:
- {{fee.feePerKBUnit}} per kB
- (Average confirmation time: {{fee.nbBlocks * 10}} minutes)
+ ng-show="index.currentFeeLevel == fee.level" class="pointer" ng-click="home.openFeeLevelsModal(index.feeLevels, index.currentFeeLevel)">
+ Fee level: {{fee.level}}
+ ({{fee.feePerKBUnit}}/KB)
+
-
Change
diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index ae485f5ab..81f2251e1 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -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,
diff --git a/src/js/services/feeService.js b/src/js/services/feeService.js
index 88a84eb23..76293155c 100644
--- a/src/js/services/feeService.js
+++ b/src/js/services/feeService.js
@@ -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;