Skip to content

fix(web): keep PR merge confirmation stable while closing - #6234

Closed
flamboh wants to merge 2 commits into
pingdotgg:mainfrom
flamboh:t3code/fix-merge-dialog-flash
Closed

fix(web): keep PR merge confirmation stable while closing#6234
flamboh wants to merge 2 commits into
pingdotgg:mainfrom
flamboh:t3code/fix-merge-dialog-flash

Conversation

@flamboh

@flamboh flamboh commented Aug 11, 2026

Copy link
Copy Markdown

What Changed

The PR action dialog now keeps its confirmation action alive until the exit animation completes. Dialog visibility is tracked separately, and the action is cleared through onOpenChangeComplete after the popup has closed.

Confirmation copy also returns nothing when no action is pending.

Why

Confirming a merge immediately cleared the pending action. The existing copy logic treated every non-merge value, including the cleared state, as a close action while the dialog remained mounted for its exit animation. That briefly changed the dialog to “Close pull request?” before it disappeared.

Keeping the action until the close animation finishes preserves the original merge copy for the dialog’s entire visible lifetime.

UI Changes

Before

Cap 2026-08-11 at 14 47 57

After

Cap 2026-08-11 at 15 09 39

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for any UI changes
  • I included a video for animation/interaction changes

Made with GPT-5.6 Sol using the Codex harness in T3 Code.

Note

Fix PR merge confirmation dialog to retain content during close animation

Separates confirmOpen (visibility) from confirmAction (selected action) in PullRequestDetailPanel so the dialog content is not cleared until after the exit animation completes. Extracts confirmation copy (title, description, submit label, destructive flag) into a new describePullRequestConfirmation helper in pullRequestDetail.logic.ts, providing a single source of truth for dialog content across merge, auto-merge, and close actions.

Macroscope summarized f01d140.

@coderabbitai

coderabbitai Bot commented Aug 11, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 35e0f4ba-acec-4037-9643-ecb423b2af7b

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Aug 11, 2026
macroscopeapp[bot]
macroscopeapp Bot previously approved these changes Aug 11, 2026
@macroscopeapp

macroscopeapp Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved 6be0ea3

This PR fixes a UI animation glitch by separating dialog visibility state from action state, ensuring the confirmation content stays stable during the close animation. The helper function extraction is a clean refactor with no behavior changes to merge/close operations.

You can customize Macroscope's approvability policy. Learn more.

@flamboh
flamboh force-pushed the t3code/fix-merge-dialog-flash branch from a16f141 to fdadc64 Compare August 12, 2026 22:09
@macroscopeapp
macroscopeapp Bot dismissed their stale review August 12, 2026 22:10

Dismissing prior approval to re-evaluate fdadc64

macroscopeapp[bot]
macroscopeapp Bot previously approved these changes Aug 12, 2026
@flamboh
flamboh force-pushed the t3code/fix-merge-dialog-flash branch from fdadc64 to 6be0ea3 Compare August 14, 2026 01:12
@macroscopeapp
macroscopeapp Bot dismissed their stale review August 14, 2026 01:13

Dismissing prior approval to re-evaluate 6be0ea3

@flamboh

flamboh commented Aug 19, 2026

Copy link
Copy Markdown
Author

Closing: main now fixes this same bug the same way via #7381 (separate open state, action cleared in onOpenChangeComplete after the exit animation), so this PR is obsolete.

@flamboh flamboh closed this Aug 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:M 30-99 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant