diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html
index 73b10bf7d..9476cf1a6 100644
--- a/public/views/preferencesFee.html
+++ b/public/views/preferencesFee.html
@@ -3,7 +3,7 @@
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Bitcoin Network Fee Policy'; goBackToState = 'preferencesGlobal'; noColor = true">
-
+
-
-
+
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index f3d603535..d4b07bccd 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -358,7 +358,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
}
$log.debug('Wallet Status:', walletStatus);
self.setPendingTxps(walletStatus.pendingTxps);
- self.setFeesOpts();
+
+ if (!self.feeLevels) {
+ self.setFeesOpts();
+ }
// Status Shortcuts
self.walletName = walletStatus.wallet.name;
@@ -405,6 +408,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
if (self.availableBalanceSat > feeToSendMaxSat) {
self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit);
self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName;
+ } else {
+ self.feeToSendMaxStr = null;
}
if (cb) return cb(self.currentFeePerKb, self.availableMaxBalance, self.feeToSendMaxStr);
@@ -662,7 +667,9 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.alternativeIsoCode = config.alternativeIsoCode;
// Set fee level and max value to send all
- self.setCurrentFeeLevel();
+ if (!self.currentFeeLevel) {
+ self.setCurrentFeeLevel();
+ }
// Check address
addressService.isUsed(self.walletId, balance.byAddress, function(err, used) {