From c924e1116bcfd5990bfe724954aa63884591358b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Tue, 9 May 2017 18:39:09 -0300 Subject: [PATCH] check if fingerprint modal is open --- src/js/services/applicationService.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/js/services/applicationService.js b/src/js/services/applicationService.js index c1d80b8a9..fe364a514 100644 --- a/src/js/services/applicationService.js +++ b/src/js/services/applicationService.js @@ -45,6 +45,7 @@ angular.module('copayApp.services') hardwareBackButtonClose: false }).then(function(modal) { scope.fingerprintCheckModal = modal; + root.isModalOpen = true; scope.openModal(); }); scope.openModal = function() { @@ -52,6 +53,7 @@ angular.module('copayApp.services') checkFingerprint(); }; scope.hideModal = function() { + root.isModalOpen = false; scope.fingerprintCheckModal.hide(); }; @@ -68,8 +70,6 @@ angular.module('copayApp.services') root.pinModal = function(action) { - if (root.isPinModalOpen) return; - var scope = $rootScope.$new(true); scope.action = action; $ionicModal.fromTemplateUrl('views/modals/pin.html', { @@ -79,7 +79,7 @@ angular.module('copayApp.services') hardwareBackButtonClose: false }).then(function(modal) { scope.pinModal = modal; - root.isPinModalOpen = true; + root.isModalOpen = true; scope.openModal(); }); scope.openModal = function() { @@ -87,13 +87,15 @@ angular.module('copayApp.services') }; scope.hideModal = function() { scope.$emit('pinModalClosed'); - root.isPinModalOpen = false; + root.isModalOpen = false; scope.pinModal.hide(); }; }; root.appLockModal = function(action) { + if (root.isModalOpen) return; + configService.whenAvailable(function(config) { var lockMethod = config.lock && config.lock.method; if (!lockMethod || lockMethod == 'none') return;