Skip to content

fix(web): label pull request merge actions - #7381

Merged
maria-rcks merged 2 commits into
pingdotgg:mainfrom
tarik02:fix/pr-merge-button-mode
Aug 18, 2026
Merged

fix(web): label pull request merge actions#7381
maria-rcks merged 2 commits into
pingdotgg:mainfrom
tarik02:fix/pr-merge-button-mode

Conversation

@tarik02

@tarik02 tarik02 commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

What Changed

  • Label the primary and confirmation merge buttons from the selected merge method: Merge, Squash, or Rebase.
  • Keep the confirmation action intact until the dialog's closing transition completes, then reset it.

Why

Selecting Squash or Rebase still left the primary and confirmation buttons labeled Merge, even though the selected method would be used.

Dismissing the confirmation dialog also reset its content as the closing transition began, causing parts of the dialog to disappear mid-animation.

UI Changes

Before

before.webm

After

after.webm

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

Built with GPT-5.6-Sol using Codex in T3 Code.


Note

Low Risk
Localized UI and dialog state in the pull request detail panel; merge behavior still uses the existing perform path with selectedMergeMethod.

Overview
Merge controls in PullRequestDetailPanel now reflect the selected merge strategy (Merge, Squash, or Rebase) on the primary action button, the merge-method menu radios, and the confirmation dialog’s confirm label—instead of always saying Merge while selectedMergeMethod is passed to perform.

Confirmation flow is refactored from a nullable confirmAction to confirmation: { open, action }. onOpenChangeComplete clears the stored action only after the dialog close animation finishes, so title/copy/button text no longer flicker or vanish mid-dismiss.

Reviewed by Cursor Bugbot for commit d27d496. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Label pull request merge actions with human-readable method names

Adds a MERGE_METHOD_LABELS mapping in PullRequestDetailPanel.tsx to display "Merge", "Squash", or "Rebase" instead of raw method identifiers. The primary merge button, merge method radio options, and confirmation dialog button all now reflect the selected label. The confirmation state is refactored from a nullable string to an object with an explicit open flag, so the action type is preserved during the dialog close animation.

Macroscope summarized d27d496.

@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, add credits to your account and enable them for code reviews in your settings.

@coderabbitai

coderabbitai Bot commented Aug 18, 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: 005dea97-1772-4ca3-bf6b-66e320fcf0d3

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 18, 2026
@macroscopeapp

macroscopeapp Bot commented Aug 18, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at d27d496

Macroscope's review found this PR approvable — This PR adds proper display labels for merge method buttons (showing 'Squash'/'Rebase' instead of always 'Merge') and refactors dialog state to prevent UI flickering during close animations. The changes are purely cosmetic and don't affect merge behavior.

You can add or adjust custom eligibility rules. Learn more.

macroscopeapp[bot]
macroscopeapp Bot previously approved these changes Aug 18, 2026
@macroscopeapp
macroscopeapp Bot dismissed their stale review August 18, 2026 08:54

Dismissing prior approval to re-evaluate d27d496

@maria-rcks
maria-rcks merged commit 26af903 into pingdotgg:main Aug 18, 2026
19 checks passed
github-actions Bot added a commit to omarcresp/t3code-flake that referenced this pull request Aug 18, 2026
## What's Changed
* feat(web): show project location in new thread picker by @StiensWout in pingdotgg/t3code#7392
* fix(packaging): install AUR launcher icons where icon themes look by @AugusDogus in pingdotgg/t3code#7421
* fix(web): label pull request merge actions by @tarik02 in pingdotgg/t3code#7381
* fix(server): avoid PRs inherited from default upstreams by @gsimone in pingdotgg/t3code#7317
* fix(desktop): stop the passkey dialog from popping as soon as sign-in opens by @t3dotgg in pingdotgg/t3code#7437

## New Contributors
* @AugusDogus made their first contribution in pingdotgg/t3code#7421

**Full Changelog**: pingdotgg/t3code@v0.0.34-nightly.20260818.1127...v0.0.34-nightly.20260818.1128

Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.34-nightly.20260818.1128
frankdavidcorona pushed a commit to frankdavidcorona/t3code that referenced this pull request Aug 18, 2026
ohbentos pushed a commit to ohbentos/t3code that referenced this pull request Aug 18, 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.

2 participants