PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Ensure UserInfo can be rendered without a room (#7687) (#7694)

Browse source 
Co-authored-by: David Baker <dave@matrix.org>

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
David Baker 2022-02-01 15:40:27 +00:00 committed by GitHub
parent bdcdd745ba
commit b7c8ce6920
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/right_panel/UserInfo.tsx
View file

@ -1518,7 +1518,7 @@ export type Member = User | RoomMember | GroupMember;
const UserInfoHeader: React.FC<{ const UserInfoHeader: React.FC<{
member: Member; member: Member;
e2eStatus: E2EStatus; e2eStatus: E2EStatus;
roomId: string; roomId?: string;
}> = ({ member, e2eStatus, roomId }) => { }> = ({ member, e2eStatus, roomId }) => {
const cli = useContext(MatrixClientContext); const cli = useContext(MatrixClientContext);
const statusMessage = useUserStatusMessage(member); const statusMessage = useUserStatusMessage(member);
@ -1710,7 +1710,7 @@ const UserInfo: React.FC<IProps> = ({
const header = <React.Fragment> const header = <React.Fragment>
{ scopeHeader } { scopeHeader }
<UserInfoHeader member={member} e2eStatus={e2eStatus} roomId={room.roomId} /> <UserInfoHeader member={member} e2eStatus={e2eStatus} roomId={room?.roomId} />
</React.Fragment>; </React.Fragment>;
return <BaseCard return <BaseCard
className={classes.join(" ")} className={classes.join(" ")}