From 07909b5075214995527ce43e995dc57c239ccaa0 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 15 Jun 2016 15:06:12 -0300 Subject: [PATCH] Not show error when fetching paypro after qr scan --- src/js/controllers/walletHome.js | 2 +- src/js/services/onGoingProcess.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 815e24ffe..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 && !self.blockUx) { + 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 69cd9abbf..d7fe002ba 100644 --- a/src/js/services/onGoingProcess.js +++ b/src/js/services/onGoingProcess.js @@ -34,6 +34,10 @@ angular.module('copayApp.services').factory('ongoingProcess', function($log, $ti ongoingProcess = {}; }; + root.get = function(processName) { + return ongoingProcess[processName]; + }; + root.set = function(processName, isOn) { $log.debug('ongoingProcess', processName, isOn); root[processName] = isOn;