Skip to content

Commit 446d800

Browse files
committed
Merge remote-tracking branch 'upstream/master'
# Conflicts: # app/(public)/join/[code]/JoinButton.tsx # app/(public)/join/page.tsx # app/components/Chat.tsx # app/components/chat/Messages.tsx # app/components/chat/hooks/useActiveConversationStream.ts # app/components/dashboard/LeaderbordList.tsx
2 parents 49666d1 + 0e761ff commit 446d800

4 files changed

Lines changed: 2 additions & 4 deletions

File tree

app/(public)/join/[code]/JoinButton.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ export default function JoinButton({
8787
if (existingMembership) {
8888
return { alreadyMember: true };
8989
}
90-
9190
const { error } = await supabase.from("leaderboard_members").insert({
9291
leaderboard_id: board.id,
9392
user_id: user.id,

app/components/Chat.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ export default function Chat({ user }: { user: User }) {
377377

378378
toast.success("Message unsent.");
379379
};
380-
381380
return (
382381
<>
383382
<MediaViewerModal

app/components/chat/Messages.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ export default function Messages({
110110
longPressTimerRef.current = null;
111111
}, 450);
112112
};
113-
114113
return (
115114
<>
116115
<MediaViewerModal

app/components/dashboard/LeaderbordList.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ export default async function LeaderboardsList() {
3131
supabase
3232
.from("leaderboard_members")
3333
.select("leaderboards(id, name, slug, owner_id)")
34-
.eq("user_id", user.id),
34+
.eq("user_id", user.id)
35+
.eq("role", "member"),
3536
]);
3637

3738
const owned = ownResult.data || [];

0 commit comments

Comments
 (0)