forked from github/cinny
update references to use callMembership instead
This commit is contained in:
@@ -53,7 +53,7 @@ import {
|
|||||||
} from '../../hooks/useRoomsNotificationPreferences';
|
} from '../../hooks/useRoomsNotificationPreferences';
|
||||||
import { RoomNotificationModeSwitcher } from '../../components/RoomNotificationSwitcher';
|
import { RoomNotificationModeSwitcher } from '../../components/RoomNotificationSwitcher';
|
||||||
import { useCallState } from '../../pages/client/call/CallProvider';
|
import { useCallState } from '../../pages/client/call/CallProvider';
|
||||||
import { useCallMembers } from '../../hooks/useCallMembers';
|
import { useCallMembers } from '../../hooks/useCallMemberships';
|
||||||
import { useRoomNavigate } from '../../hooks/useRoomNavigate';
|
import { useRoomNavigate } from '../../hooks/useRoomNavigate';
|
||||||
import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
|
import { ScreenSize, useScreenSizeContext } from '../../hooks/useScreenSize';
|
||||||
import { RoomNavUser } from './RoomNavUser';
|
import { RoomNavUser } from './RoomNavUser';
|
||||||
@@ -239,7 +239,7 @@ export function RoomNavItem({
|
|||||||
(receipt) => receipt.userId !== mx.getUserId()
|
(receipt) => receipt.userId !== mx.getUserId()
|
||||||
);
|
);
|
||||||
const isActiveCall = isCallActive && activeCallRoomId === room.roomId;
|
const isActiveCall = isCallActive && activeCallRoomId === room.roomId;
|
||||||
const callMembers = useCallMembers(mx, room.roomId);
|
const callMemberships = useCallMembers(mx, room.roomId);
|
||||||
const { navigateRoom } = useRoomNavigate();
|
const { navigateRoom } = useRoomNavigate();
|
||||||
const { roomIdOrAlias: viewedRoomId } = useParams();
|
const { roomIdOrAlias: viewedRoomId } = useParams();
|
||||||
const screenSize = useScreenSizeContext();
|
const screenSize = useScreenSizeContext();
|
||||||
@@ -302,7 +302,7 @@ export function RoomNavItem({
|
|||||||
? [
|
? [
|
||||||
'Call Room',
|
'Call Room',
|
||||||
isActiveCall && 'Currently in Call',
|
isActiveCall && 'Currently in Call',
|
||||||
callMembers.length && `${callMembers.length} in Call`,
|
callMemberships.length && `${callMemberships.length} in Call`,
|
||||||
]
|
]
|
||||||
: 'Text Room',
|
: 'Text Room',
|
||||||
unread?.total && `${unread.total} Messages`,
|
unread?.total && `${unread.total} Messages`,
|
||||||
@@ -461,8 +461,8 @@ export function RoomNavItem({
|
|||||||
</NavItem>
|
</NavItem>
|
||||||
{room.isCallRoom() && (
|
{room.isCallRoom() && (
|
||||||
<Box direction="Column" style={{ paddingLeft: config.space.S200 }}>
|
<Box direction="Column" style={{ paddingLeft: config.space.S200 }}>
|
||||||
{callMembers.map((userId) => (
|
{callMemberships.map((callMembership) => (
|
||||||
<RoomNavUser room={room} userId={userId} />
|
<RoomNavUser room={room} callMembership={callMembership} />
|
||||||
))}
|
))}
|
||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user