fix(web): label pull request merge actions - #7381
Conversation
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
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. Comment |
ApprovabilityVerdict: Approved at 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. |
Dismissing prior approval to re-evaluate d27d496
## 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
What Changed
Merge,Squash, orRebase.Why
Selecting
SquashorRebasestill left the primary and confirmation buttons labeledMerge, 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
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
performpath withselectedMergeMethod.Overview
Merge controls in
PullRequestDetailPanelnow reflect the selected merge strategy (Merge,Squash, orRebase) on the primary action button, the merge-method menu radios, and the confirmation dialog’s confirm label—instead of always saying Merge whileselectedMergeMethodis passed toperform.Confirmation flow is refactored from a nullable
confirmActiontoconfirmation: { open, action }.onOpenChangeCompleteclears 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_LABELSmapping inPullRequestDetailPanel.tsxto 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 explicitopenflag, so the action type is preserved during the dialog close animation.Macroscope summarized d27d496.