diff --git a/packages/react-composites/src/composites/common/ControlBar/DesktopMoreButton.tsx b/packages/react-composites/src/composites/common/ControlBar/DesktopMoreButton.tsx index cefafdd8728..8a7b347c8f2 100644 --- a/packages/react-composites/src/composites/common/ControlBar/DesktopMoreButton.tsx +++ b/packages/react-composites/src/composites/common/ControlBar/DesktopMoreButton.tsx @@ -26,7 +26,12 @@ import { showDtmfDialer } from '../../CallComposite/utils/MediaGalleryUtils'; import { useSelector } from '../../CallComposite/hooks/useSelector'; import { getTargetCallees } from '../../CallComposite/selectors/baseSelectors'; /* @conditional-compile-remove(together-mode) */ -import { getIsTogetherModeActive, getCapabilites, getLocalUserId } from '../../CallComposite/selectors/baseSelectors'; +import { + getIsTogetherModeActive, + getCapabilites, + getLocalUserId, + getIsTeamsCall +} from '../../CallComposite/selectors/baseSelectors'; import { getTeamsMeetingCoordinates, getIsTeamsMeeting } from '../../CallComposite/selectors/baseSelectors'; import { CallControlOptions } from '../../CallComposite'; @@ -86,6 +91,8 @@ export const DesktopMoreButton = (props: DesktopMoreButtonProps): JSX.Element => const participantCapability = useSelector(getCapabilites); /* @conditional-compile-remove(together-mode) */ const participantId = useSelector(getLocalUserId); + /* @conditional-compile-remove(together-mode) */ + const isTeamsCall = useSelector(getIsTeamsCall); const [dtmfDialerChecked, setDtmfDialerChecked] = useState(props.dtmfDialerPresent ?? false); @@ -456,7 +463,9 @@ export const DesktopMoreButton = (props: DesktopMoreButtonProps): JSX.Element => /* @conditional-compile-remove(overflow-top-composite) */ galleryOptions.subMenuProps?.items?.push(overflowGalleryOption); /* @conditional-compile-remove(together-mode) */ - galleryOptions.subMenuProps?.items?.push(togetherModeOption); + if (isTeamsCall || isTeamsMeeting) { + galleryOptions.subMenuProps?.items?.push(togetherModeOption); + } if (props.callControls === true || (props.callControls as CallControlOptions)?.galleryControlsButton !== false) { moreButtonContextualMenuItems.push(galleryOptions); } diff --git a/packages/react-composites/src/composites/common/Drawer/MoreDrawer.tsx b/packages/react-composites/src/composites/common/Drawer/MoreDrawer.tsx index 0fd76545960..75431f45eba 100644 --- a/packages/react-composites/src/composites/common/Drawer/MoreDrawer.tsx +++ b/packages/react-composites/src/composites/common/Drawer/MoreDrawer.tsx @@ -46,7 +46,12 @@ import { SpokenLanguageSettingsDrawer } from './SpokenLanguageSettingsDrawer'; import { DtmfDialPadOptions } from '../../CallComposite'; import { getRemoteParticipantsConnectedSelector } from '../../CallComposite/selectors/mediaGallerySelector'; /* @conditional-compile-remove(together-mode) */ -import { getCapabilites, getIsTogetherModeActive, getLocalUserId } from '../../CallComposite/selectors/baseSelectors'; +import { + getCapabilites, + getIsTogetherModeActive, + getLocalUserId, + getIsTeamsCall +} from '../../CallComposite/selectors/baseSelectors'; /** @private */ export interface MoreDrawerStrings { @@ -211,7 +216,10 @@ export const MoreDrawer = (props: MoreDrawerProps): JSX.Element => { const participantId = useSelector(getLocalUserId); /* @conditional-compile-remove(together-mode) */ const isTogetherModeActive = useSelector(getIsTogetherModeActive); + /* @conditional-compile-remove(together-mode) */ + const isTeamsCall = useSelector(getIsTeamsCall); + const isTeamsMeeting = getIsTeamsMeeting(callAdapter.getState()); const onSpeakerItemClick = useCallback( ( _ev: React.MouseEvent | React.KeyboardEvent | undefined, @@ -419,7 +427,9 @@ export const MoreDrawer = (props: MoreDrawerProps): JSX.Element => { /* @conditional-compile-remove(gallery-layout-composite) */ galleryLayoutOptions.subMenuProps?.push(galleryOption); /* @conditional-compile-remove(together-mode) */ - galleryLayoutOptions.subMenuProps?.push(togetherModeOption); + if (isTeamsCall || isTeamsMeeting) { + galleryLayoutOptions.subMenuProps?.push(togetherModeOption); + } if (drawerSelectionOptions !== false && isEnabled(drawerSelectionOptions?.galleryControlsButton)) { drawerMenuItems.push(galleryLayoutOptions); @@ -477,8 +487,6 @@ export const MoreDrawer = (props: MoreDrawerProps): JSX.Element => { }); } - const isTeamsMeeting = getIsTeamsMeeting(callAdapter.getState()); - const teamsMeetingCoordinates = getTeamsMeetingCoordinates(callAdapter.getState()); if (