From 0258563acabc410315bedb15bf0a3540c2b4351d Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Thu, 10 Oct 2024 14:37:57 +0530
Subject: [PATCH 1/2] fix the rendering logic

---
 .../issues/issue-detail/issue-activity/root.tsx          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/core/components/issues/issue-detail/issue-activity/root.tsx b/web/core/components/issues/issue-detail/issue-activity/root.tsx
index 8bb15b9731b..3f2723c06d4 100644
--- a/web/core/components/issues/issue-detail/issue-activity/root.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/root.tsx
@@ -10,11 +10,12 @@ import { TOAST_TYPE, setToast } from "@plane/ui";
 import { IssueCommentCreate } from "@/components/issues";
 import { IssueActivityCommentRoot } from "@/components/issues/issue-detail";
 // hooks
-import { useIssueDetail, useProject } from "@/hooks/store";
+import { useIssueDetail, useProject, useUserPermissions } from "@/hooks/store";
 // plane web components
 import { ActivityFilterRoot, IssueActivityWorklogCreateButton } from "@/plane-web/components/issues/worklog";
 // plane web constants
 import { TActivityFilters, defaultActivityFilters } from "@/plane-web/constants/issues";
+import { EUserPermissions } from "@/plane-web/constants/user-permissions";
 
 type TIssueActivity = {
   workspaceSlug: string;
@@ -34,7 +35,11 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
   const { workspaceSlug, projectId, issueId, disabled = false, isIntakeIssue = false } = props;
   // hooks
   const { createComment, updateComment, removeComment } = useIssueDetail();
+  const { projectPermissionsByWorkspaceSlugAndProjectId } = useUserPermissions();
   const { getProjectById } = useProject();
+  //derived values
+  const isGuest = projectPermissionsByWorkspaceSlugAndProjectId(workspaceSlug, projectId) === EUserPermissions.GUEST;
+  const isWorklogButtonEnabled = !isIntakeIssue && !isGuest;
   // state
   const [selectedFilters, setSelectedFilters] = useState<TActivityFilters[]>(defaultActivityFilters);
   // toggle filter
@@ -115,7 +120,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
       <div className="flex items-center justify-between">
         <div className="text-lg text-custom-text-100">Activity</div>
         <div className="flex items-center gap-2">
-          {!isIntakeIssue && (
+          {isWorklogButtonEnabled && (
             <IssueActivityWorklogCreateButton
               workspaceSlug={workspaceSlug}
               projectId={projectId}

From ec28b052ecad77d0d50bcf5181495ab78fb65a26 Mon Sep 17 00:00:00 2001
From: sharma01ketan <sharma01ketan@gmail.com>
Date: Thu, 10 Oct 2024 14:52:44 +0530
Subject: [PATCH 2/2] fix handle nullish value

---
 web/core/components/issues/issue-detail/issue-activity/root.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/core/components/issues/issue-detail/issue-activity/root.tsx b/web/core/components/issues/issue-detail/issue-activity/root.tsx
index 3f2723c06d4..d77c8613b38 100644
--- a/web/core/components/issues/issue-detail/issue-activity/root.tsx
+++ b/web/core/components/issues/issue-detail/issue-activity/root.tsx
@@ -38,7 +38,7 @@ export const IssueActivity: FC<TIssueActivity> = observer((props) => {
   const { projectPermissionsByWorkspaceSlugAndProjectId } = useUserPermissions();
   const { getProjectById } = useProject();
   //derived values
-  const isGuest = projectPermissionsByWorkspaceSlugAndProjectId(workspaceSlug, projectId) === EUserPermissions.GUEST;
+  const isGuest = (projectPermissionsByWorkspaceSlugAndProjectId(workspaceSlug, projectId) ?? EUserPermissions.GUEST) === EUserPermissions.GUEST;
   const isWorklogButtonEnabled = !isIntakeIssue && !isGuest;
   // state
   const [selectedFilters, setSelectedFilters] = useState<TActivityFilters[]>(defaultActivityFilters);