diff --git a/apps/desktop/src/lib/trpc/routers/projects/projects.ts b/apps/desktop/src/lib/trpc/routers/projects/projects.ts index 6ebf14bf94c..318ecf24644 100644 --- a/apps/desktop/src/lib/trpc/routers/projects/projects.ts +++ b/apps/desktop/src/lib/trpc/routers/projects/projects.ts @@ -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 { diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/DeleteWorkspaceDialog/DeleteWorkspaceDialog.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/DeleteWorkspaceDialog/DeleteWorkspaceDialog.tsx index 7398cb9933b..c7ba3cb0d52 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/DeleteWorkspaceDialog/DeleteWorkspaceDialog.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceListItem/components/DeleteWorkspaceDialog/DeleteWorkspaceDialog.tsx @@ -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(() => { @@ -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", }); }; @@ -165,8 +165,8 @@ export function DeleteWorkspaceDialog({ {reason} ) : ( - 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. )} @@ -194,22 +194,15 @@ export function DeleteWorkspaceDialog({ > Cancel - - - - - - Hide from tabs. Worktree stays on disk and can be reopened later. - - +