Skip to content

fix(desktop): truncate long base-branch name in 'from' label #5985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AviPeltz merged 3 commits into from
Aug 1, 2026
Merged

fix(desktop): truncate long base-branch name in 'from' label #5985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da71211
fix(desktop): truncate long base-branch name in 'from' label
ethan0905 Jul 27, 2026
f317e5e
fix(desktop): show full branch name on hover for truncated 'from' labels
ethan0905 Jul 27, 2026
b93d494
fix(desktop): satisfy typecheck for nullable base-branch title
AviPeltz Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions apps/desktop/src/renderer/routes/_authenticated/_dashboard/project/$projectId/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,12 +371,20 @@ function ProjectPage() {

<div className="rounded-md border border-border/60 bg-card/40 px-3 py-2 text-sm">
<div className="flex items-center gap-2 text-muted-foreground">
<GoGitBranch className="size-3.5" />
<span className="font-mono">
<GoGitBranch className="size-3.5 shrink-0" />
<span
className="min-w-0 truncate font-mono"
title={generatedBranchName || "branch-name"}
>
{generatedBranchName || "branch-name"}
</span>
<span className="text-muted-foreground/50">from</span>
<span className="font-mono">
<span className="shrink-0 text-muted-foreground/50">
from
</span>
<span
className="min-w-0 truncate font-mono"
title={effectiveCompareBaseBranch ?? undefined}
>
{effectiveCompareBaseBranch}
</span>
</div>
Expand Down
8 changes: 5 additions & 3 deletions ...WorkspaceSidebar/hooks/useChangesTab/components/BaseBranchSelector/BaseBranchSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ export function BaseBranchSelector({
<PopoverTrigger asChild>
<button
type="button"
className="inline-flex items-center gap-0.5 font-medium text-foreground hover:underline"
className="inline-flex min-w-0 items-center gap-0.5 font-medium text-foreground hover:underline"
>
{currentValue}
<ChevronDown className="size-3" />
<span className="min-w-0 truncate" title={currentValue}>
{currentValue}
</span>
<ChevronDown className="size-3 shrink-0" />
</button>
</PopoverTrigger>
<PopoverContent
Expand Down
5 changes: 4 additions & 1 deletion ...omponents/WorkspaceSidebar/hooks/useChangesTab/components/ChangesHeader/ChangesHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ export function ChangesHeader({
/>
) : (
<>
<span className="min-w-0 truncate font-medium">
<span
className="min-w-0 truncate font-medium"
title={currentBranch.name}
>
{currentBranch.name}
</span>
{canRename && (
Expand Down
Loading