From c831f4ce8c520ebab46127ee71ab035e1d9bc57c Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Tue, 23 Feb 2016 09:54:35 -0300 Subject: [PATCH] fix locking amount in send --- src/js/controllers/index.js | 5 ++++- src/js/controllers/walletHome.js | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 49415116d..2f6af493e 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -79,7 +79,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r $log.debug('Cleaning Index Instance'); lodash.each(self, function(v, k) { if (lodash.isFunction(v)) return; - if (vanillaScope[k]) return; + if (vanillaScope[k]) { + self[k] = vanillaScope[k]; + return; + } // This are to prevent flicker in mobile: if (k == 'hasProfile') return; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 144f6867c..412390955 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -56,7 +56,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $log.debug('Cleaning WalletHome Instance'); lodash.each(self, function(v, k) { if (lodash.isFunction(v)) return; - if (vanillaScope[k]) return; + if (vanillaScope[k]) { + self[k] = vanillaScope[k]; + return; + } delete self[k]; }); @@ -823,7 +826,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }, 1); }; - +// subscription this.setOngoingProcess = function(name) { var self = this; self.blockUx = !!name;