From 50b5e0e86dbe1fe5c0b9ac9d10763be7653e66f4 Mon Sep 17 00:00:00 2001 From: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Date: Tue, 6 Oct 2026 23:25:12 +0000 Subject: [PATCH] fix(web): keep checkout stable while pr actions load --- .../src/components/pullRequest/PullRequestDetailPanel.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx index 53dc7642d9be..45ce5d33ef7b 100644 --- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx +++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx @@ -1601,10 +1601,10 @@ export function PullRequestDetailPanel({ actions={ handoffSummary ? ( - {checkoutControl} {handoffSummary.state === "open" && handoffSummary.mergeability === "conflicting" ? resolveConflictsControl : null} + {checkoutControl} ) : undefined } @@ -1817,7 +1817,6 @@ export function PullRequestDetailPanel({ threadRef={null} /> ) : null} - {checkoutControl} {/* Said where the Merge button is, because it is the answer to why nobody has pressed it: the merge is already asked for, and the host is holding it. */} {autoMergeArmed && primaryAction !== "auto-merge-armed" ? ( @@ -1950,6 +1949,9 @@ export function PullRequestDetailPanel({ ) : null} + {/* Keep checkout beside the menu so host actions arriving on its left cannot + move a different action under the reader's pointer. */} + {checkoutControl}