Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions apps/desktop/src/lib/trpc/routers/projects/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,10 @@ export const createProjectsRouter = (getWindow: () => BrowserWindow | null) => {
});
} else {
// Update isLocal flag for branches that exist both locally and remotely
const existing = branchMap.get(branch)!;
existing.isLocal = true;
const existing = branchMap.get(branch);
if (existing) {
existing.isLocal = true;
}
}
}
} catch {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function DeleteWorkspaceDialog({
onOpenChange(false);

toast.promise(closeWorkspace.mutateAsync({ id: workspaceId }), {
loading: "Closing...",
loading: "Hiding...",
success: (result) => {
if (result.terminalWarning) {
setTimeout(() => {
Expand All @@ -75,10 +75,10 @@ export function DeleteWorkspaceDialog({
});
}, 100);
}
return "Workspace closed";
return "Workspace hidden";
},
error: (error) =>
error instanceof Error ? error.message : "Failed to close",
error instanceof Error ? error.message : "Failed to hide",
});
};

Expand Down Expand Up @@ -165,8 +165,8 @@ export function DeleteWorkspaceDialog({
<span className="text-destructive">{reason}</span>
) : (
<span className="block">
Close to hide from tabs (keeps files). Delete to permanently
remove worktree from disk.
Deleting will permanently remove the worktree. You can hide
instead to keep files on disk.
</span>
)}
</div>
Expand Down Expand Up @@ -194,22 +194,15 @@ export function DeleteWorkspaceDialog({
>
Cancel
</Button>
<Tooltip delayDuration={400}>
<TooltipTrigger asChild>
<Button
variant="secondary"
size="sm"
className="h-7 px-3 text-xs"
onClick={handleClose}
disabled={isLoading}
>
Close
</Button>
</TooltipTrigger>
<TooltipContent side="top" className="text-xs max-w-[200px]">
Hide from tabs. Worktree stays on disk and can be reopened later.
</TooltipContent>
</Tooltip>
<Button
variant="secondary"
size="sm"
className="h-7 px-3 text-xs"
onClick={handleClose}
disabled={isLoading}
>
Hide
</Button>
<Tooltip delayDuration={400}>
<TooltipTrigger asChild>
<Button
Expand Down
Loading