From 1337e25f26fb182f5e1dd7dc9c97613bfc6138b4 Mon Sep 17 00:00:00 2001
From: vamsikrishnamathala <matalav55@gmail.com>
Date: Thu, 24 Jul 2025 14:28:26 +0530
Subject: [PATCH] fix: archived work item redirection

---
 .../issue-detail/issue-detail-quick-actions.tsx       |  5 ++---
 .../core/components/issues/peek-overview/header.tsx   | 11 ++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/web/core/components/issues/issue-detail/issue-detail-quick-actions.tsx b/apps/web/core/components/issues/issue-detail/issue-detail-quick-actions.tsx
index 1884d521b05..242c1399df7 100644
--- a/apps/web/core/components/issues/issue-detail/issue-detail-quick-actions.tsx
+++ b/apps/web/core/components/issues/issue-detail/issue-detail-quick-actions.tsx
@@ -106,9 +106,8 @@ export const IssueDetailQuickActions: FC<Props> = observer((props) => {
 
   const handleArchiveIssue = async () => {
     try {
-      await archiveIssue(workspaceSlug, projectId, issueId).then(() => {
-        router.push(`/${workspaceSlug}/projects/${projectId}/archives/issues/${issue.id}`);
-      });
+      await archiveIssue(workspaceSlug, projectId, issueId);
+      router.push(`/${workspaceSlug}/projects/${projectId}/issues`);
       captureSuccess({
         eventName: WORK_ITEM_TRACKER_EVENTS.archive,
         payload: { id: issueId },
diff --git a/apps/web/core/components/issues/peek-overview/header.tsx b/apps/web/core/components/issues/peek-overview/header.tsx
index f7f361ea0a4..5081a1ae239 100644
--- a/apps/web/core/components/issues/peek-overview/header.tsx
+++ b/apps/web/core/components/issues/peek-overview/header.tsx
@@ -86,8 +86,6 @@ export const IssuePeekOverviewHeader: FC<PeekOverviewHeaderProps> = observer((pr
   } = props;
   // ref
   const parentRef = useRef<HTMLDivElement>(null);
-  // router
-  const router = useAppRouter();
   const { t } = useTranslation();
   // store hooks
   const { data: currentUser } = useUser();
@@ -96,6 +94,7 @@ export const IssuePeekOverviewHeader: FC<PeekOverviewHeaderProps> = observer((pr
     setPeekIssue,
     removeIssue,
     archiveIssue,
+    getIsIssuePeeked,
   } = useIssueDetail();
   const { isMobile } = usePlatformOS();
   const { getProjectIdentifierById } = useProject();
@@ -155,9 +154,11 @@ export const IssuePeekOverviewHeader: FC<PeekOverviewHeaderProps> = observer((pr
 
   const handleArchiveIssue = async () => {
     try {
-      await archiveIssue(workspaceSlug, projectId, issueId).then(() => {
-        router.push(`/${workspaceSlug}/projects/${projectId}/archives/issues/${issueDetails?.id}`);
-      });
+      await archiveIssue(workspaceSlug, projectId, issueId);
+      // check and remove if issue is peeked
+      if (getIsIssuePeeked(issueId)) {
+        removeRoutePeekId();
+      }
       captureSuccess({
         eventName: WORK_ITEM_TRACKER_EVENTS.archive,
         payload: { id: issueId },