diff --git a/src/app/features/room-settings/permissions/Permissions.tsx b/src/app/features/room-settings/permissions/Permissions.tsx index fe6b098ba..7572a71bf 100644 --- a/src/app/features/room-settings/permissions/Permissions.tsx +++ b/src/app/features/room-settings/permissions/Permissions.tsx @@ -23,7 +23,7 @@ export function Permissions({ requestClose }: PermissionsProps) { const canEditPowers = permissions.stateEvent(StateEvent.PowerLevelTags, mx.getSafeUserId()); const canEditPermissions = permissions.stateEvent(StateEvent.RoomPowerLevels, mx.getSafeUserId()); - const permissionGroups = usePermissionGroups(room.isCallRoom()); + const permissionGroups = usePermissionGroups(); const [powerEditor, setPowerEditor] = useState(false); diff --git a/src/app/features/room-settings/permissions/usePermissionItems.ts b/src/app/features/room-settings/permissions/usePermissionItems.ts index d4f5f562b..ad92eacfe 100644 --- a/src/app/features/room-settings/permissions/usePermissionItems.ts +++ b/src/app/features/room-settings/permissions/usePermissionItems.ts @@ -2,7 +2,7 @@ import { useMemo } from 'react'; import { MessageEvent, StateEvent } from '../../../../types/matrix/room'; import { PermissionGroup } from '../../common-settings/permissions'; -export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { +export const usePermissionGroups = (): PermissionGroup[] => { const groups: PermissionGroup[] = useMemo(() => { const messagesGroup: PermissionGroup = { name: 'Messages', @@ -216,13 +216,13 @@ export const usePermissionGroups = (isCallRoom: boolean): PermissionGroup[] => { return [ messagesGroup, - ...(isCallRoom ? [callSettingsGroup] : []), + callSettingsGroup, moderationGroup, roomOverviewGroup, roomSettingsGroup, otherSettingsGroup, ]; - }, [isCallRoom]); + }, []); return groups; }; diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx index 956167c13..bd3af45f2 100644 --- a/src/app/features/room/RoomViewHeader.tsx +++ b/src/app/features/room/RoomViewHeader.tsx @@ -70,6 +70,7 @@ import { InviteUserPrompt } from '../../components/invite-user-prompt'; import { ContainerColor } from '../../styles/ContainerColor.css'; import { RoomSettingsPage } from '../../state/roomSettings'; import { useCallEmbed, useCallStart } from '../../hooks/useCallEmbed'; +import { useLivekitSupport } from '../../hooks/useLivekitSupport'; type RoomMenuProps = { room: Room; @@ -385,7 +386,11 @@ export function RoomViewHeader({ callView }: { callView?: boolean }) { const creators = useRoomCreators(room); const permissions = useRoomPermissions(creators, powerLevels); - const hasCallPermission = permissions.event(StateEvent.GroupCallMemberPrefix, mx.getSafeUserId()); + const hasCallPermission = permissions.stateEvent( + StateEvent.GroupCallMemberPrefix, + mx.getSafeUserId() + ); + const livekitSupported = useLivekitSupport(); const [menuAnchor, setMenuAnchor] = useState(); const [pinMenuAnchor, setPinMenuAnchor] = useState(); @@ -580,7 +585,7 @@ export function RoomViewHeader({ callView }: { callView?: boolean }) { } /> - {direct && hasCallPermission && } + {livekitSupported && hasCallPermission && } {screenSize === ScreenSize.Desktop && (