Skip to content

fix: The default branch should always come first in the branch selector #396

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
charlesvien merged 1 commit into from
Jan 6, 2026
Merged

fix: The default branch should always come first in the branch selector #396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions apps/array/src/renderer/features/task-detail/components/BranchSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export function BranchSelect({
}
};

// filter branches based on search query
// filter and sort branches based on search query
const filteredBranches = useMemo(() => {
let result = branches;
if (searchQuery.trim()) {
Expand All @@ -153,8 +153,14 @@ export function BranchSelect({
branch.toLowerCase().includes(query),
);
}
// Sort alphabetically, but default branch always comes first
result = [...result].sort((a, b) => {
if (a === defaultBranch) return -1;
if (b === defaultBranch) return 1;
return a.localeCompare(b);
});
return result.slice(0, MAX_DISPLAYED_BRANCHES);
}, [branches, searchQuery]);
}, [branches, searchQuery, defaultBranch]);

const hasMoreBranches =
branches.length > MAX_DISPLAYED_BRANCHES && !searchQuery;
Expand Down