diff --git a/src/home/CallList.tsx b/src/home/CallList.tsx index 99296c5d..8e17c013 100644 --- a/src/home/CallList.tsx +++ b/src/home/CallList.tsx @@ -23,7 +23,7 @@ import { Facepile } from "../Facepile"; import { Avatar, Size } from "../Avatar"; import styles from "./CallList.module.css"; import { getRoomUrl } from "../matrix-utils"; -import { Body, Caption } from "../typography/Typography"; +import { Body } from "../typography/Typography"; import { GroupCallRoom } from "./useGroupCallRooms"; import { useRoomSharedKey } from "../e2ee/sharedKeyManagement"; @@ -42,7 +42,6 @@ export function CallList({ rooms, client, disableFacepile }: CallListProps) { client={client} name={roomName} avatarUrl={avatarUrl} - roomAlias={roomAlias} roomId={room.roomId} participants={participants} disableFacepile={disableFacepile} @@ -61,7 +60,6 @@ export function CallList({ rooms, client, disableFacepile }: CallListProps) { interface CallTileProps { name: string; avatarUrl: string; - roomAlias: string; roomId: string; participants: RoomMember[]; client: MatrixClient; @@ -70,7 +68,6 @@ interface CallTileProps { function CallTile({ name, avatarUrl, - roomAlias, roomId, participants, client, @@ -80,10 +77,7 @@ function CallTile({ return (
- + {name} - {getRoomUrl(roomAlias)} {participants && !disableFacepile && (
); diff --git a/src/home/RegisteredView.tsx b/src/home/RegisteredView.tsx index 8fbea9c1..5de21a3e 100644 --- a/src/home/RegisteredView.tsx +++ b/src/home/RegisteredView.tsx @@ -80,7 +80,7 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) { randomString(32) ); - history.push(`/${roomAlias.substring(1).split(":")[0]}`); + history.push(`/room/#?roomId=${roomId}`); } submit().catch((error) => { @@ -103,7 +103,7 @@ export function RegisteredView({ client, isPasswordlessUser }: Props) { const [existingRoomId, setExistingRoomId] = useState(); const onJoinExistingRoom = useCallback(() => { - history.push(`/${existingRoomId}`); + history.push(`/room/#?roomId=${existingRoomId}`); }, [history, existingRoomId]); const callNameLabel = diff --git a/src/home/UnauthenticatedView.tsx b/src/home/UnauthenticatedView.tsx index f479901f..a9c840df 100644 --- a/src/home/UnauthenticatedView.tsx +++ b/src/home/UnauthenticatedView.tsx @@ -110,7 +110,7 @@ export const UnauthenticatedView: FC = () => { } setClient({ client, session }); - history.push(`/${roomAlias.substring(1).split(":")[0]}`); + history.push(`/room/#?roomId=${roomId}`); } submit().catch((error) => { diff --git a/src/home/useGroupCallRooms.ts b/src/home/useGroupCallRooms.ts index 0f5d8ef9..58135b04 100644 --- a/src/home/useGroupCallRooms.ts +++ b/src/home/useGroupCallRooms.ts @@ -89,8 +89,7 @@ export function useGroupCallRooms(client: MatrixClient): GroupCallRoom[] { const groupCalls = client.groupCallEventHandler.groupCalls.values(); const rooms = Array.from(groupCalls).map((groupCall) => groupCall.room); - const filteredRooms = rooms.filter((r) => r.getCanonicalAlias()); // We don't display rooms without an alias - const sortedRooms = sortRooms(client, filteredRooms); + const sortedRooms = sortRooms(client, rooms); const items = sortedRooms.map((room) => { const groupCall = client.getGroupCallForRoom(room.roomId)!; diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx index fa1c1754..fd3964c6 100644 --- a/src/room/InCallView.tsx +++ b/src/room/InCallView.tsx @@ -461,11 +461,7 @@ export function InCallView({ /> )} {inviteModalState.isOpen && ( - + )} ); diff --git a/src/room/InviteModal.tsx b/src/room/InviteModal.tsx index 1986374b..e52e7f3a 100644 --- a/src/room/InviteModal.tsx +++ b/src/room/InviteModal.tsx @@ -24,11 +24,10 @@ import styles from "./InviteModal.module.css"; import { useRoomSharedKey } from "../e2ee/sharedKeyManagement"; interface Props extends Omit { - roomAlias?: string; roomId: string; } -export const InviteModal: FC = ({ roomAlias, roomId, ...rest }) => { +export const InviteModal: FC = ({ roomId, ...rest }) => { const { t } = useTranslation(); const [roomSharedKey] = useRoomSharedKey(roomId); @@ -43,7 +42,7 @@ export const InviteModal: FC = ({ roomAlias, roomId, ...rest }) => {

{t("Copy and share this call link")}

diff --git a/src/room/LobbyView.tsx b/src/room/LobbyView.tsx index e3f80d43..ad5f999c 100644 --- a/src/room/LobbyView.tsx +++ b/src/room/LobbyView.tsx @@ -82,10 +82,7 @@ export const LobbyView: FC = ({ Or