Merge pull request Expensify#48620 from Krishna2323/krishna2323/issue…

…/47857 fix: Scan - Clicking outside of the allow location modal submits the scan expense.
DylanDylann · Sep 6, 2024 · ec012fe · ec012fe
2 parents da8370f + a6a92ad
commit ec012fe
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/components/ConfirmModal.tsx b/src/components/ConfirmModal.tsx
@@ -19,6 +19,9 @@ type ConfirmModalProps = {
     /** A callback to call when the form has been closed */
     onCancel?: () => void;
 
+    /** A callback to call when backdrop is pressed */
+    onBackdropPress?: () => void;
+
     /** Modal visibility */
     isVisible: boolean;
 
@@ -108,6 +111,7 @@ function ConfirmModal({
     success = true,
     danger = false,
     onCancel = () => {},
+    onBackdropPress = () => {},
     shouldDisableConfirmButtonWhenOffline = false,
     shouldShowCancelButton = true,
     shouldSetModalVisibility = true,
@@ -140,6 +144,7 @@ function ConfirmModal({
         <Modal
             onSubmit={onConfirm}
             onClose={onCancel}
+            onBackdropPress={onBackdropPress}
             isVisible={isVisible}
             shouldSetModalVisibility={shouldSetModalVisibility}
             onModalHide={onModalHide}

diff --git a/src/components/LocationPermissionModal/index.android.tsx b/src/components/LocationPermissionModal/index.android.tsx
@@ -63,11 +63,17 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
         setHasError(false);
     };
 
+    const closeModal = () => {
+        setShowModal(false);
+        resetPermissionFlow();
+    };
+
     return (
         <ConfirmModal
             isVisible={showModal}
             onConfirm={grantLocationPermission}
             onCancel={skipLocationPermission}
+            onBackdropPress={closeModal}
             confirmText={hasError ? translate('common.settings') : translate('common.continue')}
             cancelText={translate('common.notNow')}
             prompt={translate(hasError ? 'receipt.locationErrorMessage' : 'receipt.locationAccessMessage')}

diff --git a/src/components/LocationPermissionModal/index.tsx b/src/components/LocationPermissionModal/index.tsx
@@ -77,11 +77,16 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
         return isWeb ? translate('common.buttonConfirm') : translate('common.settings');
     };
 
+    const closeModal = () => {
+        setShowModal(false);
+        resetPermissionFlow();
+    };
     return (
         <ConfirmModal
             isVisible={showModal}
             onConfirm={grantLocationPermission}
             onCancel={skipLocationPermission}
+            onBackdropPress={closeModal}
             confirmText={getConfirmText()}
             cancelText={translate('common.notNow')}
             prompt={translate(hasError ? 'receipt.locationErrorMessage' : 'receipt.locationAccessMessage')}