Merge pull request #52088 from c3024/use-platform-specific-mute-setting

Use platform specific mute setting for sounds

src/libs/Sound/BaseSound.ts

@@ -1,11 +1,15 @@
 import Onyx from 'react-native-onyx';
+import getPlatform from '@libs/getPlatform';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 let isMuted = false;
 
 Onyx.connect({
-    key: ONYXKEYS.USER,
-    callback: (val) => (isMuted = !!val?.isMutedAllSounds),
+    key: ONYXKEYS.NVP_MUTED_PLATFORMS,
+    callback: (val) => {
+        const platform = getPlatform(true);
+        isMuted = !!val?.[platform];
+    },
 });
 
 const SOUNDS = {

src/libs/getPlatform/index.ts

@@ -1,6 +1,10 @@
+import * as Browser from '@libs/Browser';
 import CONST from '@src/CONST';
 import type Platform from './types';
 
-export default function getPlatform(): Platform {
+export default function getPlatform(shouldMobileWebBeDistinctFromWeb = false): Platform {
+    if (shouldMobileWebBeDistinctFromWeb && Browser.isMobile()) {
+        return CONST.PLATFORM.MOBILEWEB;
+    }
     return CONST.PLATFORM.WEB;
 }

src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

@@ -30,6 +30,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
 import getPhotoSource from '@libs/fileDownload/getPhotoSource';
 import getCurrentPosition from '@libs/getCurrentPosition';
+import getPlatform from '@libs/getPlatform';
 import * as IOUUtils from '@libs/IOUUtils';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
@@ -75,7 +76,9 @@ function IOURequestStepScan({
     const policy = usePolicy(report?.policyID);
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const [skipConfirmation] = useOnyx(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID ?? -1}`);
-    const [user] = useOnyx(ONYXKEYS.USER);
+    const platform = getPlatform(true);
+    const [mutedPlatforms = {}] = useOnyx(ONYXKEYS.NVP_MUTED_PLATFORMS);
+    const isPlatformMuted = mutedPlatforms[platform];
     const [cameraPermissionStatus, setCameraPermissionStatus] = useState<string | null>(null);
     const [didCapturePhoto, setDidCapturePhoto] = useState(false);
     const [isLoadingReceipt, setIsLoadingReceipt] = useState(false);
@@ -494,7 +497,7 @@ function IOURequestStepScan({
         camera?.current
             ?.takePhoto({
                 flash: flash && hasFlash ? 'on' : 'off',
-                enableShutterSound: !user?.isMutedAllSounds,
+                enableShutterSound: !isPlatformMuted,
             })
             .then((photo: PhotoFile) => {
                 // Store the receipt on the transaction object in Onyx
@@ -540,7 +543,7 @@ function IOURequestStepScan({
         didCapturePhoto,
         flash,
         hasFlash,
-        user?.isMutedAllSounds,
+        isPlatformMuted,
         translate,
         transactionID,
         isEditing,

src/pages/settings/Preferences/PreferencesPage.tsx

@@ -13,7 +13,6 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as Browser from '@libs/Browser';
 import getPlatform from '@libs/getPlatform';
 import LocaleUtils from '@libs/LocaleUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -25,7 +24,7 @@ import ROUTES from '@src/ROUTES';
 function PreferencesPage() {
     const [priorityMode] = useOnyx(ONYXKEYS.NVP_PRIORITY_MODE);
 
-    const platform = Browser.isMobile() ? CONST.PLATFORM.MOBILEWEB : getPlatform();
+    const platform = getPlatform(true);
     const [mutedPlatforms = {}] = useOnyx(ONYXKEYS.NVP_MUTED_PLATFORMS);
     const isPlatformMuted = mutedPlatforms[platform];
     const [user] = useOnyx(ONYXKEYS.USER);

src/types/onyx/User.ts

@@ -6,9 +6,6 @@ type User = {
     /** Whether we should use the staging version of the secure API server */
     shouldUseStagingServer?: boolean;
 
-    /** Whether user muted all sounds in application */
-    isMutedAllSounds?: boolean;
-
     /** Is the user account validated? */
     validated: boolean;