Skip to content

fix(desktop): clear stale PR status on task switch #80376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trunk-io merged 1 commit into from
Aug 10, 2026
Merged

fix(desktop): clear stale PR status on task switch #80376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions products/desktop/packages/ui/src/features/sidebar/useTaskPrStatus.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,14 @@ describe("useTaskPrStatus", () => {
);
expect(lastQueryOptions?.enabled).toBe(true);
});

it("ignores placeholder data when the query is disabled", () => {
queryData = { prState: "open", hasDiff: true };
const { result } = renderHook(() =>
useTaskPrStatus(
makeTask({ taskRunEnvironment: "cloud", cloudPrUrl: null }),
),
);
expect(result.current).toEqual({ prState: null, hasDiff: false });
});
});
4 changes: 3 additions & 1 deletion products/desktop/packages/ui/src/features/sidebar/useTaskPrStatus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ export function useTaskPrStatus(task: {
),
);

if (!data || (!data.prState && !data.hasDiff)) return EMPTY;
// A disabled query can retain placeholder data from the previously selected
// task. Ignore it so a cloud task without a PR never shows stale PR status.
if (skipQuery || !data || (!data.prState && !data.hasDiff)) return EMPTY;
return data;
}
Loading