fix(task-title-bar): show merge target branch in button tooltip#144
Merged
johannesjo merged 2 commits intoMay 26, 2026
Merged
Conversation
The merge button tooltip in TaskTitleBar previously hardcoded "Merge into main" and the initial fix replaced it with a fallback to 'main' when task.baseBranch was undefined — but MergeDialog resolves the target differently (task.baseBranch ?? mergeStatus.base_branch ?? 'main'), so the tooltip could silently disagree with the dialog. Instead, only name the target when we actually know it. ResultsScreen had the same hardcoded "Merge into main" label on the arena merge button, but that flow calls MergeTask without baseBranch and the handler auto-detects the project's main branch (could be master, develop, etc.). Dropping the misleading suffix here too. Also inline the helper — single call site, KISS.
Owner
|
Thank you very much! <3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Show the actual merge target branch (from
task.baseBranch) in the merge button tooltip, instead of hardcoding "main".Changes
getMergeButtonTitle()helper inTaskTitleBar.tsxMerge into ${baseBranch}with fallback to "main"