Skip to content

Commit 80664d5

Browse files
TonybynMp4claude
andauthored
fix(web): compact merge buttons show when they need a second click (#18878)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent ae7bed6 commit 80664d5

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

‎apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
ArrowLeftIcon,
2727
ArrowUpRightIcon,
2828
BookOpenIcon,
29+
CheckIcon,
2930
CircleDotIcon,
3031
CopyIcon,
3132
ChevronDownIcon,
@@ -2043,7 +2044,11 @@ export function PullRequestDetailPanel({
20432044
: pendingAutoMergeLabel
20442045
}
20452046
>
2046-
<PullRequestGlyph.merged aria-hidden className="size-3.5" />
2047+
{inlineConfirm.isArmed("enable-auto-merge") ? (
2048+
<CheckIcon aria-hidden className="size-3.5" />
2049+
) : (
2050+
<PullRequestGlyph.merged aria-hidden className="size-3.5" />
2051+
)}
20472052
<span className="inline-grid @max-[30rem]/pr-header:hidden">
20482053
<span aria-hidden className="invisible col-start-1 row-start-1">
20492054
{pendingAutoMergeLabel}
@@ -2112,7 +2117,11 @@ export function PullRequestDetailPanel({
21122117
: selectedMergeMethodLabel
21132118
}
21142119
>
2115-
<PullRequestGlyph.merged aria-hidden className="size-3.5" />
2120+
{inlineConfirm.isArmed("merge") ? (
2121+
<CheckIcon aria-hidden className="size-3.5" />
2122+
) : (
2123+
<PullRequestGlyph.merged aria-hidden className="size-3.5" />
2124+
)}
21162125
<span className="inline-grid @max-[30rem]/pr-header:hidden">
21172126
<span aria-hidden className="invisible col-start-1 row-start-1">
21182127
{selectedMergeMethodLabel}

0 commit comments

Comments
 (0)