Merge branch 'recording-supported' into 'main'

avoid loading recording module and codec when recording is not supported

See merge request web/clients!25325

Author: MargeBot

applications/meet/src/app/components/RecordingControls/RecordingControls.tsx

@@ -16,7 +16,7 @@ import {
 } from '@proton/meet/store/slices/recordingStatusSlice';
 import { selectSubscriptionStatus } from '@proton/meet/store/slices/userSlice';
 import { PLANS } from '@proton/payments/core/constants';
-import { isFirefox, isMobile } from '@proton/shared/lib/helpers/browser';
+import { isFirefox } from '@proton/shared/lib/helpers/browser';
 import { dateLocale } from '@proton/shared/lib/i18n';
 import IcCircleRadioFilled from '@proton/styles/assets/img/meet/ic-circle-radio-filled.svg';
 import { useFlag } from '@proton/unleash/useFlag';
@@ -26,6 +26,7 @@ import { CircleButton } from '../../atoms/CircleButton/CircleButton';
 import { useMeetingRecorderContext } from '../../contexts/MeetingRecorderContext';
 import { useIsLargerThanMd } from '../../hooks/useIsLargerThanMd';
 import { useIsLocalParticipantAdmin } from '../../hooks/useIsLocalParticipantAdmin';
+import { useIsRecordingSupported } from '../../hooks/useMeetingRecorderNew/hooks/useIsRecordingSupported';
 import { ScreenRecordingUpsell } from '../AnonymousModal/feature-upsell/ScreenRecordingUpsell';
 import { SubUserScreenRecordingUpsell } from '../AnonymousModal/feature-upsell/SubUserScreenRecordingUpsell';
 import { ConfirmationModal } from '../ConfirmationModal/ConfirmationModal';
@@ -93,7 +94,7 @@ export const RecordingControls = () => {
     const { isPaidUser, isSubUser } = useMeetSelector(selectSubscriptionStatus);
     const isGuestAdmin = useMeetSelector(selectIsGuestAdmin);
 
-    const recordingNotSupported = isMobile() || isFirefox();
+    const isRecordingSupported = useIsRecordingSupported();
 
     const hasAdminPermission = isLocalParticipantAdmin || isLocalParticipantHost || isGuestAdmin;
 
@@ -136,7 +137,7 @@ export const RecordingControls = () => {
         return null;
     }
 
-    if (recordingNotSupported) {
+    if (!isRecordingSupported) {
         if (isFirefox()) {
             return (
                 <CircleButton

applications/meet/src/app/hooks/useMeetingRecorderNew/hooks/useIsRecordingSupported.ts

@@ -0,0 +1,5 @@
+import { isFirefox, isMobile } from '@proton/shared/lib/helpers/browser';
+
+export const useIsRecordingSupported = () => {
+    return !isFirefox() && !isMobile();
+};

applications/meet/src/app/hooks/useMeetingRecorderNew/useMeetingRecorder.ts

@@ -24,6 +24,7 @@ import { useIsLargerThanMd } from '../useIsLargerThanMd';
 import { useIsNarrowHeight } from '../useIsNarrowHeight';
 import { useStableCallback } from '../useStableCallback';
 import { useHaveRecordingPermissions } from './hooks/useHaveRecordingPermissions';
+import { useIsRecordingSupported } from './hooks/useIsRecordingSupported';
 import { useRecordedTracks } from './hooks/useRecordedTracks';
 import { useRecordingCodec } from './hooks/useRecordingCodec';
 import { useRecordingScene } from './hooks/useRecordingScene';
@@ -33,7 +34,8 @@ import { RecordingSession } from './recordingSession/recordingSession';
 
 export const useMeetingRecorder = () => {
     const hasRecordingPermissions = useHaveRecordingPermissions();
-    const recordingCodec = useRecordingCodec(hasRecordingPermissions);
+    const isRecordingSupported = useIsRecordingSupported();
+    const recordingCodec = useRecordingCodec(hasRecordingPermissions && isRecordingSupported);
 
     const room = useRoomContext();
     const dispatch = useMeetDispatch();