From 418735724badd5bdf51331845ba11a07728c5aa5 Mon Sep 17 00:00:00 2001
From: Henry <henry_ball@hotmail.co.uk>
Date: Wed, 26 Feb 2025 22:32:13 +0000
Subject: [PATCH] fix: prevent provider error for public boards

---
 apps/web/src/views/card/components/ActivityList.tsx | 7 +++----
 apps/web/src/views/card/index.tsx                   | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/views/card/components/ActivityList.tsx b/apps/web/src/views/card/components/ActivityList.tsx
index 0c84755e..6e9afda9 100644
--- a/apps/web/src/views/card/components/ActivityList.tsx
+++ b/apps/web/src/views/card/components/ActivityList.tsx
@@ -12,7 +12,6 @@ import {
 import type { GetCardByIdOutput } from "@kan/api/types";
 
 import Avatar from "~/components/Avatar";
-import { useWorkspace } from "~/providers/workspace";
 import Comment from "./Comment";
 
 type ActivityType =
@@ -141,13 +140,13 @@ const ActivityList = ({
   activities,
   cardPublicId,
   isLoading,
+  isAdmin,
 }: {
   activities: NonNullable<GetCardByIdOutput>["activities"];
   cardPublicId: string;
   isLoading: boolean;
+  isAdmin?: boolean;
 }) => {
-  const { workspace } = useWorkspace();
-
   return (
     <div className="flex flex-col space-y-4 pt-4">
       {activities.map((activity, index) => {
@@ -174,7 +173,7 @@ const ActivityList = ({
               comment={activity.comment?.comment}
               isEdited={!!activity.comment?.updatedAt}
               isAuthor={activity.comment?.createdBy === activity.user?.id}
-              isAdmin={workspace.role === "admin"}
+              isAdmin={isAdmin ?? false}
             />
           );
 
diff --git a/apps/web/src/views/card/index.tsx b/apps/web/src/views/card/index.tsx
index 36505705..7d259f0d 100644
--- a/apps/web/src/views/card/index.tsx
+++ b/apps/web/src/views/card/index.tsx
@@ -11,6 +11,7 @@ import { NewWorkspaceForm } from "~/components/NewWorkspaceForm";
 import { PageHead } from "~/components/PageHead";
 import { useModal } from "~/providers/modal";
 import { usePopup } from "~/providers/popup";
+import { useWorkspace } from "~/providers/workspace";
 import { api } from "~/utils/api";
 import { formatMemberDisplayName } from "~/utils/helpers";
 import { getPublicUrl } from "~/utils/supabase/getPublicUrl";
@@ -36,6 +37,7 @@ export default function CardPage() {
   const utils = api.useUtils();
   const { modalContentType, entityId } = useModal();
   const { showPopup } = usePopup();
+  const { workspace } = useWorkspace();
 
   const cardId = Array.isArray(router.query.cardId)
     ? router.query.cardId[0]
@@ -206,6 +208,7 @@ export default function CardPage() {
                   cardPublicId={cardId}
                   activities={activities ?? []}
                   isLoading={isLoading}
+                  isAdmin={workspace.role === "admin"}
                 />
               </div>
               <div className="mt-6">