diff --git a/ui/src/pages/IssueDetail.test.tsx b/ui/src/pages/IssueDetail.test.tsx index 4a59314de6..439732e8bb 100644 --- a/ui/src/pages/IssueDetail.test.tsx +++ b/ui/src/pages/IssueDetail.test.tsx @@ -2643,7 +2643,7 @@ describe("IssueDetail", () => { }); }); - it("keeps inbox archive actions scoped to an inbox-origin task", async () => { + it("archives a task-page issue with y and returns to the inbox", async () => { mockLocation.state = createIssueDetailLocationState( "Tasks", "/issues/all", @@ -2679,7 +2679,10 @@ describe("IssueDetail", () => { document.dispatchEvent( new KeyboardEvent("keydown", { key: "y", bubbles: true }), ); - expect(mockIssuesApi.archiveFromInbox).not.toHaveBeenCalled(); + await waitForAssertion(() => { + expect(mockIssuesApi.archiveFromInbox).toHaveBeenCalledWith("issue-1"); + expect(mockNavigate).toHaveBeenCalledWith("/inbox", { replace: true }); + }); }); it("arms the inbox archive shortcut only for the selected inbox row", async () => { diff --git a/ui/src/pages/IssueDetail.tsx b/ui/src/pages/IssueDetail.tsx index b85b20b97d..eb1cbfca47 100644 --- a/ui/src/pages/IssueDetail.tsx +++ b/ui/src/pages/IssueDetail.tsx @@ -92,7 +92,6 @@ import { readIssueDetailHeaderSeed, withIssueDetailHeaderSeed, rememberIssueDetailLocationState, - shouldArmIssueDetailInboxQuickArchive, } from "../lib/issueDetailBreadcrumb"; import { resolveIssueActiveRun, @@ -5667,10 +5666,7 @@ export function IssueDetail({ tasksTab }: { tasksTab?: TaskSidePanelProps["tasks const goToInboxShortcutArmedRef = useRef(false); const goToInboxShortcutTimeoutRef = useRef(null); const canQuickArchiveFromInbox = - keyboardShortcutsEnabled && - (!streamlinedUiEnabled || - (isFromInbox && shouldArmIssueDetailInboxQuickArchive(location.state))) && - !issue?.hiddenAt; + keyboardShortcutsEnabled && !issue?.hiddenAt; useEffect(() => { if (!issue?.id || !canQuickArchiveFromInbox) return;