From 5cfc0378f78d6ea409b07f8da7ea3c1d99172204 Mon Sep 17 00:00:00 2001 From: damencho Date: Mon, 10 Mar 2025 15:47:57 -0500 Subject: [PATCH] fix(av-moderation): Skip hiding AV moderation menu. --- lang/main.json | 2 +- .../components/native/ContextMenuMore.tsx | 7 ++----- .../components/web/FooterContextMenu.tsx | 10 ++-------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/lang/main.json b/lang/main.json index 8fd24dd0da..1331ef094f 100644 --- a/lang/main.json +++ b/lang/main.json @@ -848,7 +848,7 @@ "actions": { "admit": "Admit", "admitAll": "Admit all", - "allow": "Allow attendees to:", + "allow": "Allow non-moderators to:", "allowVideo": "Allow video", "askUnmute": "Ask to unmute", "audioModeration": "Unmute themselves", diff --git a/react/features/participants-pane/components/native/ContextMenuMore.tsx b/react/features/participants-pane/components/native/ContextMenuMore.tsx index 08c04cd85c..df8e9c77d1 100644 --- a/react/features/participants-pane/components/native/ContextMenuMore.tsx +++ b/react/features/participants-pane/components/native/ContextMenuMore.tsx @@ -22,8 +22,7 @@ import Icon from '../../../base/icons/components/Icon'; import { IconCheck, IconRaiseHand, IconVideoOff } from '../../../base/icons/svg'; import { MEDIA_TYPE } from '../../../base/media/constants'; import { raiseHand } from '../../../base/participants/actions'; -import { getParticipantCount, getRaiseHandsQueue, isEveryoneModerator, isLocalParticipantModerator } - from '../../../base/participants/functions'; +import { getRaiseHandsQueue, isLocalParticipantModerator } from '../../../base/participants/functions'; import { LOWER_HAND_MESSAGE } from '../../../base/tracks/constants'; import MuteEveryonesVideoDialog from '../../../video-menu/components/native/MuteEveryonesVideoDialog'; @@ -47,8 +46,6 @@ export const ContextMenuMore = () => { const { t } = useTranslation(); const isModerationSupported = useSelector((state: IReduxState) => isAvModerationSupported()(state)); - const allModerators = useSelector(isEveryoneModerator); - const participantCount = useSelector(getParticipantCount); const isAudioModerationEnabled = useSelector(isAvModerationEnabled(MEDIA_TYPE.AUDIO)); const isVideoModerationEnabled = useSelector(isAvModerationEnabled(MEDIA_TYPE.VIDEO)); @@ -79,7 +76,7 @@ export const ContextMenuMore = () => { src = { IconRaiseHand } /> {t('participantsPane.actions.lowerAllHands')} } - {isModerationSupported && ((participantCount === 1 || !allModerators)) && <> + {isModerationSupported && <> {/* @ts-ignore */} diff --git a/react/features/participants-pane/components/web/FooterContextMenu.tsx b/react/features/participants-pane/components/web/FooterContextMenu.tsx index a442305806..aa1546bb55 100644 --- a/react/features/participants-pane/components/web/FooterContextMenu.tsx +++ b/react/features/participants-pane/components/web/FooterContextMenu.tsx @@ -21,11 +21,7 @@ import { IconVideoOff } from '../../../base/icons/svg'; import { MEDIA_TYPE } from '../../../base/media/constants'; -import { - getParticipantCount, - getRaiseHandsQueue, - isEveryoneModerator -} from '../../../base/participants/functions'; +import { getRaiseHandsQueue } from '../../../base/participants/functions'; import { withPixelLineHeight } from '../../../base/styles/functions.web'; import ContextMenu from '../../../base/ui/components/web/ContextMenu'; import ContextMenuItemGroup from '../../../base/ui/components/web/ContextMenuItemGroup'; @@ -88,9 +84,7 @@ export const FooterContextMenu = ({ isOpen, onDrawerClose, onMouseLeave }: IProp const dispatch = useDispatch(); const isModerationSupported = useSelector((state: IReduxState) => isAvModerationSupported()(state)); const raisedHandsQueue = useSelector(getRaiseHandsQueue); - const allModerators = useSelector(isEveryoneModerator); const isModeratorSettingsTabEnabled = useSelector(shouldShowModeratorSettings); - const participantCount = useSelector(getParticipantCount); const isAudioModerationEnabled = useSelector(isAvModerationEnabled(MEDIA_TYPE.AUDIO)); const isVideoModerationEnabled = useSelector(isAvModerationEnabled(MEDIA_TYPE.VIDEO)); const isBreakoutRoom = useSelector(isInBreakoutRoom); @@ -151,7 +145,7 @@ export const FooterContextMenu = ({ isOpen, onDrawerClose, onMouseLeave }: IProp text: t('participantsPane.actions.stopEveryonesVideo') } ] } /> {raisedHandsQueue.length !== 0 && } - {!isBreakoutRoom && isModerationSupported && (participantCount === 1 || !allModerators) && ( + {!isBreakoutRoom && isModerationSupported && (
{t('participantsPane.actions.allow')}