From 7c66f57c3edf0b2ec0912f332a21c132eb17eaf3 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>
Date: Wed, 23 Oct 2024 13:33:58 +0530
Subject: [PATCH] fix: issue widget modal rendering

---
 web/core/components/issues/issue-detail-widgets/root.tsx | 7 +++++--
 web/core/components/issues/issue-detail/main-content.tsx | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/web/core/components/issues/issue-detail-widgets/root.tsx b/web/core/components/issues/issue-detail-widgets/root.tsx
index 364dac960bc..040fd2c2ff4 100644
--- a/web/core/components/issues/issue-detail-widgets/root.tsx
+++ b/web/core/components/issues/issue-detail-widgets/root.tsx
@@ -12,10 +12,11 @@ type Props = {
   projectId: string;
   issueId: string;
   disabled: boolean;
+  renderWidgetModals?: boolean;
 };
 
 export const IssueDetailWidgets: FC<Props> = (props) => {
-  const { workspaceSlug, projectId, issueId, disabled } = props;
+  const { workspaceSlug, projectId, issueId, disabled, renderWidgetModals = true } = props;
   return (
     <>
       <div className="flex flex-col gap-5">
@@ -32,7 +33,9 @@ export const IssueDetailWidgets: FC<Props> = (props) => {
           disabled={disabled}
         />
       </div>
-      <IssueDetailWidgetModals workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} />
+      {renderWidgetModals && (
+        <IssueDetailWidgetModals workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} />
+      )}
     </>
   );
 };
diff --git a/web/core/components/issues/issue-detail/main-content.tsx b/web/core/components/issues/issue-detail/main-content.tsx
index ffd930de422..70ac2d250e1 100644
--- a/web/core/components/issues/issue-detail/main-content.tsx
+++ b/web/core/components/issues/issue-detail/main-content.tsx
@@ -40,6 +40,7 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {
   const { data: currentUser } = useUser();
   const {
     issue: { getIssueById },
+    peekIssue,
   } = useIssueDetail();
   const { setShowAlert } = useReloadConfirmations(isSubmitting === "submitting");
 
@@ -53,6 +54,8 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {
   const issue = issueId ? getIssueById(issueId) : undefined;
   if (!issue || !issue.project_id) return <></>;
 
+  const isPeekModeActive = Boolean(peekIssue);
+
   return (
     <>
       <div className="rounded-lg space-y-4">
@@ -110,6 +113,7 @@ export const IssueMainContent: React.FC<Props> = observer((props) => {
         projectId={projectId}
         issueId={issueId}
         disabled={!isEditable || isArchived}
+        renderWidgetModals={!isPeekModeActive}
       />
 
       {windowSize[0] < 768 && (