From 4b1ca3bf5a961f00c64ff03ddc4527c3cb225529 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 19 Feb 2016 14:46:52 -0500 Subject: [PATCH] Decrease in call to feelevels --- public/views/preferencesFee.html | 2 +- public/views/preferencesHistory.html | 10 ++++++---- src/js/controllers/index.js | 11 +++++++++-- 3 files changed, 16 insertions(+), 7 deletions(-) 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) {