Skip to content

Commit 2eaa238

Browse files
committed
Fix crash when joining empty rooms
1 parent fb2100c commit 2eaa238

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/UI/components/single/Chat.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export default function Chat(props: Readonly<HTMLAttributes<HTMLDivElement>>) {
5757
)}
5858
ref={ref}
5959
>
60-
{messages[currentRoom.ID].map((message, index, arr) => (
60+
{messages[currentRoom.ID] ? messages[currentRoom.ID].map((message, index, arr) => (
6161
<ErrorBoundary
6262
key={index}
6363
fallbackRender={({ error: e }) => {
@@ -75,7 +75,7 @@ export default function Chat(props: Readonly<HTMLAttributes<HTMLDivElement>>) {
7575
prev={arr[index - 1]}
7676
/>
7777
</ErrorBoundary>
78-
))}
78+
)) : null}
7979
<div className="relative h-0 w-0">
8080
{/* invisible div to scroll to */}
8181
<div

src/UI/components/single/TrainerCard/TrainerCard.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ export default function TrainerCard(
111111
src={user.avatar ?
112112
Sprites.getAvatar(user.avatar) :
113113
Sprites.getAvatar(167)}
114+
alt="avatar"
114115
className="w-20 h-20"
115116
/>
116117
) :
@@ -146,13 +147,13 @@ function UserCardButton({
146147
icon,
147148
onClick,
148149
disabled = false,
149-
}: {
150+
}: Readonly<{
150151
name: string;
151152
alt: string;
152153
icon: ReactNode;
153154
onClick: MouseEventHandler<HTMLButtonElement>;
154155
disabled?: boolean;
155-
}) {
156+
}>) {
156157
return (
157158
<button
158159
className={'text-sm rounded-lg px-4 py-2 flex-grow-0 border border-gray-700 flex flex-col justify-center items-center ' +

0 commit comments

Comments
 (0)