diff --git a/src/app/pages/call/CallNavStatus.tsx b/src/app/features/room-nav/RoomCallNavStatus.tsx similarity index 80% rename from src/app/pages/call/CallNavStatus.tsx rename to src/app/features/room-nav/RoomCallNavStatus.tsx index 8d91fd69..034e5664 100644 --- a/src/app/pages/call/CallNavStatus.tsx +++ b/src/app/features/room-nav/RoomCallNavStatus.tsx @@ -1,30 +1,25 @@ -import { logger } from 'matrix-js-sdk/lib/logger'; -import { NavLink, useParams } from 'react-router-dom'; import { Box, Chip, Icon, IconButton, Icons, Text, Tooltip, TooltipProvider } from 'folds'; import React from 'react'; -import { useMatrixClient } from '../../hooks/useMatrixClient'; -import { useCallState } from '../client/CallProvider'; -import { getSpaceRoomPath } from '../pathUtils'; -import { getCanonicalAliasOrRoomId } from '../../utils/matrix'; -import { useNavToActivePathMapper } from '../../hooks/useNavToActivePathMapper'; -import { useSpace } from '../../hooks/useSpace'; import { Room } from 'matrix-js-sdk'; -import { useMentionClickHandler } from '../../hooks/useMentionClickHandler'; -import { - makeMentionCustomProps, - renderMatrixMention, -} from '../../plugins/react-custom-html-parser'; +import { useMatrixClient } from '../../hooks/useMatrixClient'; +import { useCallState } from '../../pages/client/call/CallProvider'; import { useRoomNavigate } from '../../hooks/useRoomNavigate'; type CallNavStatusProps = { space: Room | null; }; export function CallNavStatus({ space }: CallNavStatusProps) { - const { activeCallRoomId, isAudioEnabled, isVideoEnabled, isCallActive, toggleAudio, toggleVideo, hangUp } = - useCallState(); + const { + activeCallRoomId, + isAudioEnabled, + isVideoEnabled, + isCallActive, + toggleAudio, + toggleVideo, + hangUp, + } = useCallState(); const mx = useMatrixClient(); const { navigateRoom } = useRoomNavigate(); - const { roomIdOrAlias: viewedRoomId } = useParams<{ roomIdOrAlias: string }>(); const handleGoToCallRoom = () => { if (activeCallRoomId) { navigateRoom(activeCallRoomId); diff --git a/src/app/pages/client/direct/Direct.tsx b/src/app/pages/client/direct/Direct.tsx index 2843a2c6..f8c31f21 100644 --- a/src/app/pages/client/direct/Direct.tsx +++ b/src/app/pages/client/direct/Direct.tsx @@ -50,7 +50,7 @@ import { getRoomNotificationMode, useRoomsNotificationPreferencesContext, } from '../../../hooks/useRoomsNotificationPreferences'; -import { CallNavStatus } from '../../call/CallNavStatus'; +import { CallNavStatus } from '../../../features/room-nav/RoomCallNavStatus'; type DirectMenuProps = { requestClose: () => void; diff --git a/src/app/pages/client/home/Home.tsx b/src/app/pages/client/home/Home.tsx index 1820a77f..c3dd40f6 100644 --- a/src/app/pages/client/home/Home.tsx +++ b/src/app/pages/client/home/Home.tsx @@ -53,7 +53,7 @@ import { getRoomNotificationMode, useRoomsNotificationPreferencesContext, } from '../../../hooks/useRoomsNotificationPreferences'; -import { CallNavStatus } from '../../call/CallNavStatus'; +import { CallNavStatus } from '../../../features/room-nav/RoomCallNavStatus'; type HomeMenuProps = { requestClose: () => void; diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx index 3af997ef..fb75e61e 100644 --- a/src/app/pages/client/space/Space.tsx +++ b/src/app/pages/client/space/Space.tsx @@ -77,7 +77,7 @@ import { useRoomsNotificationPreferencesContext, } from '../../../hooks/useRoomsNotificationPreferences'; import { useOpenSpaceSettings } from '../../../state/hooks/spaceSettings'; -import { CallNavStatus } from '../../call/CallNavStatus'; +import { CallNavStatus } from '../../../features/room-nav/RoomCallNavStatus'; import { getStateEvents } from '../../../utils/room'; import { RoomNavUser } from '../../../features/room-nav/RoomNavUser'; import { useStateEvents } from '../../../hooks/useStateEvents';