diff --git a/src/app/features/lobby/RoomItem.tsx b/src/app/features/lobby/RoomItem.tsx
index f5e17bda..7de59acd 100644
--- a/src/app/features/lobby/RoomItem.tsx
+++ b/src/app/features/lobby/RoomItem.tsx
@@ -30,7 +30,7 @@ import { LocalRoomSummaryLoader } from '../../components/RoomSummaryLoader';
import { UseStateProvider } from '../../components/UseStateProvider';
import { RoomTopicViewer } from '../../components/room-topic-viewer';
import { onEnterOrSpace, stopPropagation } from '../../utils/keyboard';
-import { Membership, RoomType } from '../../../types/matrix/room';
+import { Membership } from '../../../types/matrix/room';
import * as css from './RoomItem.css';
import * as styleCss from './style.css';
import { AsyncStatus, useAsyncCallback } from '../../hooks/useAsyncCallback';
diff --git a/src/app/features/room-nav/RoomCallNavStatus.tsx b/src/app/features/room-nav/RoomCallNavStatus.tsx
index 2fb647ee..8c132c9d 100644
--- a/src/app/features/room-nav/RoomCallNavStatus.tsx
+++ b/src/app/features/room-nav/RoomCallNavStatus.tsx
@@ -1,17 +1,34 @@
-import { Box, Chip, Icon, IconButton, Icons, Line, Text, Tooltip, TooltipProvider } from 'folds';
+import {
+ Box,
+ Chip,
+ Icon,
+ IconButton,
+ Icons,
+ Line,
+ Spinner,
+ Text,
+ Tooltip,
+ TooltipProvider,
+ color,
+} from 'folds';
import React from 'react';
-import { useMatrixClient } from '../../hooks/useMatrixClient';
import { useCallState } from '../../pages/client/call/CallProvider';
import { useRoomNavigate } from '../../hooks/useRoomNavigate';
import * as css from './RoomCallNavStatus.css';
export function CallNavStatus() {
- const { activeCallRoomId, isAudioEnabled, isVideoEnabled, toggleAudio, toggleVideo, hangUp } =
- useCallState();
- const mx = useMatrixClient();
+ const {
+ activeCallRoomId,
+ isActiveCallReady,
+ isAudioEnabled,
+ isVideoEnabled,
+ toggleAudio,
+ toggleVideo,
+ hangUp,
+ } = useCallState();
const { navigateRoom } = useRoomNavigate();
const hasActiveCall = Boolean(activeCallRoomId);
-
+ const isConnected = hasActiveCall && isActiveCallReady;
const handleGoToCallRoom = () => {
if (activeCallRoomId) {
navigateRoom(activeCallRoomId);
@@ -42,9 +59,17 @@ export function CallNavStatus() {
ref={triggerRef}
className={css.RoomButton}
>
-
-
- {mx.getRoom(activeCallRoomId ?? '')?.name ?? ''}
+ {isConnected ? (
+
+ ) : (
+
+ )}
+
+ {isConnected ? 'Connected' : 'Connecting'}
)}