Skip to content

fix(branch-selector): show loading state instead of "No branches" #1967

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
jonathanlab merged 2 commits into from
May 1, 2026
+25 −11
Merged

fix(branch-selector): show loading state instead of "No branches" #1967

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a3eba5
fix(branch-selector): show loading state instead of "No branches"
ryans-posthog Apr 30, 2026
aa02e17
refactor(branch-selector): extract LoadingRow helper
ryans-posthog Apr 30, 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
36 changes: 25 additions & 11 deletions apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ import { type RefObject, useEffect, useRef, useState } from "react";

const COMBOBOX_LIMIT = 50;

function LoadingRow({ label }: { label: string }) {
return (
<div className="flex items-center gap-1 px-2 py-1.5 text-muted-foreground text-xs">
<Spinner size={12} className="animate-spin" />
{label}
</div>
);
}

interface BranchSelectorProps {
repoPath: string | null;
currentBranch: string | null;
Expand Down Expand Up @@ -94,17 +103,21 @@ export function BranchSelector({
}
}, [isSelectionOnly, defaultBranch, selectedBranch, onBranchSelect]);

const { data: localBranches = [] } = useQuery(
trpc.git.getAllBranches.queryOptions(
{ directoryPath: repoPath as string },
{ enabled: !isCloudMode && !!repoPath && open, staleTime: 10_000 },
),
);
const { data: localBranches = [], isLoading: localBranchesLoading } =
useQuery(
trpc.git.getAllBranches.queryOptions(
{ directoryPath: repoPath as string },
{ enabled: !isCloudMode && !!repoPath && open, staleTime: 10_000 },
),
);

const branches = isCloudMode ? (cloudBranches ?? []) : localBranches;
const effectiveLoading = loading || (isCloudMode && cloudBranchesLoading);
const cloudStillLoading =
isCloudMode && cloudBranchesLoading && branches.length === 0 && !open;
const branchListLoading = isCloudMode
? !!cloudBranchesLoading
: localBranchesLoading;

const checkoutMutation = useMutation(
trpc.git.checkoutBranch.mutationOptions({
Expand Down Expand Up @@ -244,13 +257,14 @@ export function BranchSelector({
</div>

{isCloudMode && cloudBranchesFetchingMore ? (
<div className="flex items-center gap-1 px-2 py-1.5 text-muted-foreground text-xs">
<Spinner size={12} className="animate-spin" />
Loading more ({branches.length})…
</div>
<LoadingRow label={`Loading more (${branches.length})…`} />
) : null}

<ComboboxEmpty>No branches found.</ComboboxEmpty>
{branchListLoading && branches.length === 0 ? (
<LoadingRow label="Loading branches…" />
) : (
<ComboboxEmpty>No branches found.</ComboboxEmpty>
)}

<ComboboxList className="max-h-[min(14rem,calc(var(--available-height,14rem)-5rem))] pe-2">
{(item: string) => (
Expand Down
Loading