From 5d2f6782e2ac476cc7086c447ef7c3d199f6b766 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 25 Sep 2015 13:39:41 -0300 Subject: [PATCH] send all button appear --- src/js/controllers/index.js | 15 ++++++++------- src/js/controllers/walletHome.js | 11 ++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index b37adad0e..470a3ef85 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -333,19 +333,20 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setSendMax = function() { + self.feeToSendMaxStr = null; + self.feeRateToSendMax = null; + // Set Send max if (self.currentFeeLevel && self.totalBytesToSendMax) { feeService.getCurrentFeeValue(self.currentFeeLevel, function(err, feePerKb) { // KB to send max - if (self.totalBytesToSendMax) { - var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb) / 1000.).toFixed(0)); - self.feeRateToSendMax = feePerKb; + var feeToSendMaxSat = parseInt(((self.totalBytesToSendMax * feePerKb) / 1000.).toFixed(0)); + self.feeRateToSendMax = feePerKb; + + if (self.availableBalanceSat > feeToSendMaxSat) { self.availableMaxBalance = strip((self.availableBalanceSat - feeToSendMaxSat) * self.satToUnit); self.feeToSendMaxStr = profileService.formatAmount(feeToSendMaxSat) + ' ' + self.unitName; - } else { - self.feeToSendMaxStr = null; - self.feeRateToSendMax = null; } }); } @@ -1255,4 +1256,4 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.setFocusedWallet(); }); }); -}); +}); \ No newline at end of file diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index c9e22425b..b79664e98 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -1315,13 +1315,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi fee: feeStr }); - if (amount - parseInt(feeStr) > 0) { - confirmDialog.show(msg, function(confirmed) { - if (confirmed) - self._doSendAll(amount, feeRate); - }); - } else - $rootScope.$emit('Local/ShowAlert', gettextCatalog.getString('Not enough funds for network fees')); + confirmDialog.show(msg, function(confirmed) { + if (confirmed) + self._doSendAll(amount, feeRate); + }); }; /* Start setup */