Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Ensure UserInfo can be rendered without a room #7687

Merged
merged 2 commits into from
Feb 1, 2022
Merged

Ensure UserInfo can be rendered without a room #7687

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f60eee8
Ensure UserInfo can be rendered without a room
t3chguy Feb 1, 2022
5330028
Merge remote-tracking branch 'origin/develop' into t3chguy/fix/20830
dbkr Feb 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/views/right_panel/UserInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1518,7 +1518,7 @@ export type Member = User | RoomMember | GroupMember;
const UserInfoHeader: React.FC<{
member: Member;
e2eStatus: E2EStatus;
roomId: string;
roomId?: string;
}> = ({ member, e2eStatus, roomId }) => {
const cli = useContext(MatrixClientContext);
const statusMessage = useUserStatusMessage(member);
Expand Down Expand Up @@ -1710,7 +1710,7 @@ const UserInfo: React.FC<IProps> = ({

const header = <React.Fragment>
{ scopeHeader }
<UserInfoHeader member={member} e2eStatus={e2eStatus} roomId={room.roomId} />
<UserInfoHeader member={member} e2eStatus={e2eStatus} roomId={room?.roomId} />
</React.Fragment>;
return <BaseCard
className={classes.join(" ")}
Expand Down