authorgravatar for 97451137+TonybynMp4@users.noreply.github.comAntony <97451137+TonybynMp4@users.noreply.github.com> 2026-10-13 05:18:08+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2026-10-13 00:18:08-03:00
log80664d5266a1be8c5989bac352ee5e060bbbdf4a
tree277dd90ea13b799188c0908b9abf4eb3d9bc7729
parentae7bed6e402897b8020f10d13747dd6a3779b5ae
signature Signed by PGP key B5690EEEBB952194

fix(web): compact merge buttons show when they need a second click (#18878)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

1 files changed, 11 insertions(+), 2 deletions(-)

apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx+11-2
...@@ -26,6 +26,7 @@ import {...@@ -26,6 +26,7 @@ import {
26 ArrowLeftIcon,26 ArrowLeftIcon,
27 ArrowUpRightIcon,27 ArrowUpRightIcon,
28 BookOpenIcon,28 BookOpenIcon,
29 CheckIcon,
29 CircleDotIcon,30 CircleDotIcon,
30 CopyIcon,31 CopyIcon,
31 ChevronDownIcon,32 ChevronDownIcon,
...@@ -2043,7 +2044,11 @@ export function PullRequestDetailPanel({...@@ -2043,7 +2044,11 @@ export function PullRequestDetailPanel({
2043 : pendingAutoMergeLabel2044 : pendingAutoMergeLabel
2044 }2045 }
2045 >2046 >
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 )}
2047 <span className="inline-grid @max-[30rem]/pr-header:hidden">2052 <span className="inline-grid @max-[30rem]/pr-header:hidden">
2048 <span aria-hidden className="invisible col-start-1 row-start-1">2053 <span aria-hidden className="invisible col-start-1 row-start-1">
2049 {pendingAutoMergeLabel}2054 {pendingAutoMergeLabel}
...@@ -2112,7 +2117,11 @@ export function PullRequestDetailPanel({...@@ -2112,7 +2117,11 @@ export function PullRequestDetailPanel({
2112 : selectedMergeMethodLabel2117 : selectedMergeMethodLabel
2113 }2118 }
2114 >2119 >
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 )}
2116 <span className="inline-grid @max-[30rem]/pr-header:hidden">2125 <span className="inline-grid @max-[30rem]/pr-header:hidden">
2117 <span aria-hidden className="invisible col-start-1 row-start-1">2126 <span aria-hidden className="invisible col-start-1 row-start-1">
2118 {selectedMergeMethodLabel}2127 {selectedMergeMethodLabel}