From 1f3f4834c6ea12d07c0c72af66a4988c1b53c851 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 16 Jun 2016 21:45:52 -0300 Subject: [PATCH] Removes isProcessing flag --- src/js/controllers/walletHome.js | 2 +- src/js/services/onGoingProcess.js | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 683d17068..3d10eef89 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -36,7 +36,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $rootScope.$emit('Local/SetTab', 'send'); var form = $scope.sendForm; - if (form.address.$invalid && !ongoingProcess.isProcessing) { + if (form.address.$invalid && !ongoingProcess.get('fetchingPayPro')) { self.resetForm(); self.error = gettext('Could not recognize a valid Bitcoin QR Code'); } diff --git a/src/js/services/onGoingProcess.js b/src/js/services/onGoingProcess.js index 66b9bbff0..9a9ed7547 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -30,11 +30,8 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti 'deletingWallet': gettext('Deleting Wallet...'), }; - root.isProcessing = false; - root.clear = function() { ongoingProcess = {}; - root.isProcessing = false; if (isCordova) { window.plugins.spinnerDialog.hide(); } else { @@ -63,7 +60,6 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti var showName = $filter('translate')(processNames[name] || name); if (root.onGoingProcessName) { - root.isProcessing = true; if (isCordova) { window.plugins.spinnerDialog.show(null, showName, true); } else { @@ -74,7 +70,6 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti }); } } else { - root.isProcessing = false; if (isCordova) { window.plugins.spinnerDialog.hide(); } else {