Remove roomAvatarUrl from MatrixInfo

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2023-06-29 08:03:30 +02:00
parent 87bd9cf026
commit 8cafe0f25d
No known key found for this signature in database
GPG key ID: BB126BDA1FFBF42B
5 changed files with 3 additions and 14 deletions

View file

@ -114,10 +114,9 @@ export function HeaderLogo({ className }: HeaderLogoProps) {
interface RoomHeaderInfo { interface RoomHeaderInfo {
roomName: string; roomName: string;
avatarUrl: string | null;
} }
export function RoomHeaderInfo({ roomName, avatarUrl }: RoomHeaderInfo) { export function RoomHeaderInfo({ roomName }: RoomHeaderInfo) {
return ( return (
<> <>
<Subtitle data-testid="roomHeader_roomName" fontWeight="semiBold"> <Subtitle data-testid="roomHeader_roomName" fontWeight="semiBold">

View file

@ -35,7 +35,6 @@ import { PosthogAnalytics } from "../analytics/PosthogAnalytics";
import { useProfile } from "../profile/useProfile"; import { useProfile } from "../profile/useProfile";
import { UserChoices } from "../livekit/useLiveKit"; import { UserChoices } from "../livekit/useLiveKit";
import { findDeviceByName } from "../media-utils"; import { findDeviceByName } from "../media-utils";
import { useRoomAvatar } from "./useRoomAvatar";
declare global { declare global {
interface Window { interface Window {
@ -82,14 +81,12 @@ export function GroupCallView({
}, [groupCall]); }, [groupCall]);
const { displayName, avatarUrl } = useProfile(client); const { displayName, avatarUrl } = useProfile(client);
const roomAvatarUrl = useRoomAvatar(groupCall.room);
const matrixInfo: MatrixInfo = { const matrixInfo: MatrixInfo = {
displayName, displayName,
avatarUrl, avatarUrl,
roomName: groupCall.room.name, roomName: groupCall.room.name,
roomIdOrAlias, roomIdOrAlias,
roomAvatarUrl,
}; };
useEffect(() => { useEffect(() => {

View file

@ -389,10 +389,7 @@ export function InCallView({
{!hideHeader && maximisedParticipant === null && ( {!hideHeader && maximisedParticipant === null && (
<Header> <Header>
<LeftNav> <LeftNav>
<RoomHeaderInfo <RoomHeaderInfo roomName={matrixInfo.roomName} />
roomName={matrixInfo.roomName}
avatarUrl={matrixInfo.roomAvatarUrl}
/>
<VersionMismatchWarning <VersionMismatchWarning
users={unencryptedEventsFromUsers} users={unencryptedEventsFromUsers}
room={groupCall.room} room={groupCall.room}

View file

@ -55,10 +55,7 @@ export function LobbyView(props: Props) {
{!props.hideHeader && ( {!props.hideHeader && (
<Header> <Header>
<LeftNav> <LeftNav>
<RoomHeaderInfo <RoomHeaderInfo roomName={props.matrixInfo.roomName} />
roomName={props.matrixInfo.roomName}
avatarUrl={props.matrixInfo.roomAvatarUrl}
/>
</LeftNav> </LeftNav>
<RightNav> <RightNav>
<UserMenuContainer /> <UserMenuContainer />

View file

@ -35,7 +35,6 @@ export type MatrixInfo = {
avatarUrl: string; avatarUrl: string;
roomName: string; roomName: string;
roomIdOrAlias: string; roomIdOrAlias: string;
roomAvatarUrl: string | null;
}; };
interface Props { interface Props {