From 1099c59b8377f2475bce1266ec3dc5eb1a80488b Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com>
Date: Thu, 17 Oct 2024 12:55:32 +0530
Subject: [PATCH] fix: draft issue empty state flicker (#5848)

---
 web/core/components/issues/workspace-draft/root.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/core/components/issues/workspace-draft/root.tsx b/web/core/components/issues/workspace-draft/root.tsx
index f0f392f3f..177b8af55 100644
--- a/web/core/components/issues/workspace-draft/root.tsx
+++ b/web/core/components/issues/workspace-draft/root.tsx
@@ -33,7 +33,7 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
   useWorkspaceIssueProperties(workspaceSlug);
 
   // fetching issues
-  useSWR(
+  const { isLoading } = useSWR(
     workspaceSlug && issueIds.length <= 0 ? `WORKSPACE_DRAFT_ISSUES_${workspaceSlug}` : null,
     workspaceSlug && issueIds.length <= 0 ? async () => await fetchIssues(workspaceSlug, "init-loader") : null
   );
@@ -44,6 +44,10 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
     await fetchIssues(workspaceSlug, "pagination", EDraftIssuePaginationType.NEXT);
   };
 
+  if (isLoading) {
+    return <WorkspaceDraftIssuesLoader items={14} />;
+  }
+
   if (workspaceProjectIds?.length === 0)
     return (
       <EmptyState
@@ -57,10 +61,6 @@ export const WorkspaceDraftIssuesRoot: FC<TWorkspaceDraftIssuesRoot> = observer(
 
   if (issueIds.length <= 0) return <WorkspaceDraftEmptyState />;
 
-  if (loader === "init-loader") {
-    return <WorkspaceDraftIssuesLoader items={14} />;
-  }
-
   return (
     <div className="relative">
       <div className="relative">