play sound fix

allroundexperts · Jun 26, 2024 · 9fe0582 · 9fe0582
1 parent 283d30f
commit 9fe0582
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/src/components/LocationPermissionModal.tsx b/src/components/LocationPermissionModal.tsx
@@ -17,9 +17,12 @@ type LocationPermissionModalProps = {
 
     /** Should start the permission flow? */
     startPermissionFlow: boolean;
+
+    /** Reset the permission flow */
+    resetPermissionFlow: () => void;
 };
 
-function LocationPermissionModal({startPermissionFlow, onDeny, onGrant}: LocationPermissionModalProps) {
+function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDeny, onGrant}: LocationPermissionModalProps) {
     const [hasError, setHasError] = useState(false);
     const [showModal, setShowModal] = useState(false);
 
@@ -37,35 +40,35 @@ function LocationPermissionModal({startPermissionFlow, onDeny, onGrant}: Locatio
             }
 
             setShowModal(true);
-            setHasError(status === RESULTS.BLOCKED || status === RESULTS.DENIED);
+            setHasError(status === RESULTS.BLOCKED);
         });
         // eslint-disable-next-line react-hooks/exhaustive-deps -- We only want to run this effect when startPermissionFlow changes
     }, [startPermissionFlow]);
 
     const errorHandler = (cb: () => void) => () => {
         if (hasError && Linking.openSettings) {
             Linking.openSettings();
+            setShowModal(false);
+            setHasError(false);
+            resetPermissionFlow();
             return;
         }
         cb();
     };
 
     const onConfirm = errorHandler(() => {
-        requestLocationPermission()
-            .then((status) => {
-                if (status === RESULTS.GRANTED || status === RESULTS.LIMITED) {
-                    onGrant();
-                } else {
-                    onDeny(status);
-                }
-            })
-            .catch(() => {
-                onDeny(RESULTS.BLOCKED);
-            })
-            .finally(() => {
-                setShowModal(false);
-                setHasError(false);
-            });
+        requestLocationPermission().then((status) => {
+            if (status === RESULTS.GRANTED || status === RESULTS.LIMITED) {
+                onGrant();
+            } else if (status === RESULTS.BLOCKED) {
+                setHasError(true);
+                return;
+            } else {
+                onDeny(status);
+            }
+            setShowModal(false);
+            setHasError(false);
+        });
     });
 
     const onCancel = () => {

diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
@@ -162,6 +162,9 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
 
     /** The action to take */
     action?: IOUAction;
+
+    /** Should play sound on confirmation */
+    shouldPlaySound?: boolean;
 };
 
 type MoneyRequestConfirmationListItem = Participant | ReportUtils.OptionData;
@@ -204,6 +207,7 @@ function MoneyRequestConfirmationList({
     action = CONST.IOU.ACTION.CREATE,
     currencyList,
     shouldDisplayReceipt = false,
+    shouldPlaySound = true,
 }: MoneyRequestConfirmationListProps) {
     const policy = policyReal ?? policyDraft;
     const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
@@ -677,7 +681,9 @@ function MoneyRequestConfirmationList({
                     return;
                 }
 
-                playSound(SOUNDS.DONE);
+                if (shouldPlaySound) {
+                    playSound(SOUNDS.DONE);
+                }
                 setDidConfirm(true);
                 onConfirm?.(selectedParticipants);
             } else {
@@ -711,6 +717,7 @@ function MoneyRequestConfirmationList({
             isDistanceRequestWithPendingRoute,
             iouAmount,
             onConfirm,
+            shouldPlaySound,
         ],
     );
 

diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -593,6 +593,7 @@ function IOURequestStepConfirmation({
                     {gpsRequired && (
                         <LocationPermissionModal
                             startPermissionFlow={startLocationPermissionFlow}
+                            resetPermissionFlow={() => setStartLocationPermissionFlow(false)}
                             onGrant={() => createTransaction(selectedParticipantList, true)}
                             onDeny={() => createTransaction(selectedParticipantList, false)}
                         />
@@ -621,6 +622,7 @@ function IOURequestStepConfirmation({
                         shouldShowSmartScanFields={isMovingTransactionFromTrackExpense ? transaction?.amount !== 0 : requestType !== CONST.IOU.REQUEST_TYPE.SCAN}
                         action={action}
                         payeePersonalDetails={payeePersonalDetails}
+                        shouldPlaySound={!gpsRequired}
                     />
                 </View>
             )}

diff --git a/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.ts b/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.ts
@@ -23,10 +23,10 @@ function getLocationPermission(): Promise<PermissionStatus> {
         if (navigator.geolocation) {
             navigator.permissions.query({name: 'geolocation'}).then((result) => {
                 if (result.state === 'prompt') {
-                    resolve(RESULTS.UNAVAILABLE);
+                    resolve(RESULTS.DENIED);
                     return;
                 }
-                resolve(result.state === 'granted' ? RESULTS.GRANTED : RESULTS.DENIED);
+                resolve(result.state === 'granted' ? RESULTS.GRANTED : RESULTS.BLOCKED);
             });
         } else {
             resolve(RESULTS.UNAVAILABLE);