From 50b18d2ed95a54038336c0fdb3ec565183df976e Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Thu, 1 Jan 2026 11:40:42 -0800
Subject: [PATCH 1/2] fix(desktop): remove redundant open project button from
 workspace modal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The new workspace modal no longer needs the "Open" button since users can open projects from the start view.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../NewWorkspaceModal/NewWorkspaceModal.tsx   | 95 ++++---------------
 1 file changed, 17 insertions(+), 78 deletions(-)

diff --git a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
index f50775ca246..98d08f1af40 100644
--- a/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
+++ b/apps/desktop/src/renderer/components/NewWorkspaceModal/NewWorkspaceModal.tsx
@@ -27,22 +27,12 @@ import {
 	SelectValue,
 } from "@superset/ui/select";
 import { toast } from "@superset/ui/sonner";
-import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { GoGitBranch } from "react-icons/go";
-import {
-	HiCheck,
-	HiChevronDown,
-	HiChevronUpDown,
-	HiFolderOpen,
-} from "react-icons/hi2";
+import { HiCheck, HiChevronDown, HiChevronUpDown } from "react-icons/hi2";
 import { formatRelativeTime } from "renderer/lib/formatRelativeTime";
 import { trpc } from "renderer/lib/trpc";
-import { useOpenNew } from "renderer/react-query/projects";
-import {
-	useCreateBranchWorkspace,
-	useCreateWorkspace,
-} from "renderer/react-query/workspaces";
+import { useCreateWorkspace } from "renderer/react-query/workspaces";
 import {
 	useCloseNewWorkspaceModal,
 	useNewWorkspaceModalOpen,
@@ -91,8 +81,6 @@ export function NewWorkspaceModal() {
 		{ enabled: !!selectedProjectId },
 	);
 	const createWorkspace = useCreateWorkspace();
-	const createBranchWorkspace = useCreateBranchWorkspace();
-	const openNew = useOpenNew();
 
 	const currentProjectId = activeWorkspace?.projectId;
 
@@ -198,36 +186,6 @@ export function NewWorkspaceModal() {
 		);
 	};
 
-	const handleOpenNewProject = async () => {
-		try {
-			const result = await openNew.mutateAsync(undefined);
-			if (result.canceled) {
-				return;
-			}
-			if ("error" in result) {
-				toast.error("Failed to open project", {
-					description: result.error,
-				});
-				return;
-			}
-			if ("needsGitInit" in result) {
-				toast.error("Selected folder is not a git repository", {
-					description:
-						"Please use 'Open project' from the start view to initialize git.",
-				});
-				return;
-			}
-			// Create a main workspace on the current branch for the new project
-			await createBranchWorkspace.mutateAsync({ projectId: result.project.id });
-			setSelectedProjectId(result.project.id);
-		} catch (error) {
-			toast.error("Failed to open project", {
-				description:
-					error instanceof Error ? error.message : "An unknown error occurred",
-			});
-		}
-	};
-
 	return (
 		<Dialog modal open={isOpen} onOpenChange={(open) => !open && handleClose()}>
 			<DialogContent
@@ -239,40 +197,21 @@ export function NewWorkspaceModal() {
 				</DialogHeader>
 
 				<div className="px-4 pb-3">
-					<div className="flex items-center gap-2">
-						<Select
-							value={selectedProjectId ?? ""}
-							onValueChange={setSelectedProjectId}
-						>
-							<SelectTrigger className="flex-1 h-8 text-sm">
-								<SelectValue placeholder="Select project" />
-							</SelectTrigger>
-							<SelectContent>
-								{recentProjects.map((project) => (
-									<SelectItem key={project.id} value={project.id}>
-										{project.name}
-									</SelectItem>
-								))}
-							</SelectContent>
-						</Select>
-						<Tooltip>
-							<TooltipTrigger asChild>
-								<Button
-									variant="ghost"
-									size="sm"
-									className="h-8 shrink-0 gap-1 text-xs"
-									onClick={handleOpenNewProject}
-									disabled={openNew.isPending}
-								>
-									<HiFolderOpen className="h-4 w-4" />
-									Open
-								</Button>
-							</TooltipTrigger>
-							<TooltipContent side="bottom" sideOffset={4}>
-								Open a new project
-							</TooltipContent>
-						</Tooltip>
-					</div>
+					<Select
+						value={selectedProjectId ?? ""}
+						onValueChange={setSelectedProjectId}
+					>
+						<SelectTrigger className="w-full h-8 text-sm">
+							<SelectValue placeholder="Select project" />
+						</SelectTrigger>
+						<SelectContent>
+							{recentProjects.map((project) => (
+								<SelectItem key={project.id} value={project.id}>
+									{project.name}
+								</SelectItem>
+							))}
+						</SelectContent>
+					</Select>
 				</div>
 
 				{selectedProjectId && (

From 29d75a2c040ac3bfe61b9986ea4b9cc277addbaa Mon Sep 17 00:00:00 2001
From: Kiet Ho <hoakiet98@gmail.com>
Date: Thu, 1 Jan 2026 11:46:04 -0800
Subject: [PATCH 2/2] New ws button

---
 .../components/TopBar/WorkspaceTabs/CreateWorkspaceButton.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/TopBar/WorkspaceTabs/CreateWorkspaceButton.tsx b/apps/desktop/src/renderer/screens/main/components/TopBar/WorkspaceTabs/CreateWorkspaceButton.tsx
index 76ea1563ae2..9281bf046c2 100644
--- a/apps/desktop/src/renderer/screens/main/components/TopBar/WorkspaceTabs/CreateWorkspaceButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/TopBar/WorkspaceTabs/CreateWorkspaceButton.tsx
@@ -149,7 +149,7 @@ export function CreateWorkspaceButton({
 						className="flex h-6 items-center gap-1 rounded-l-md pl-1.5 pr-1 text-[12px] font-medium transition-all duration-150 hover:bg-foreground/[0.06] hover:text-foreground active:scale-[0.98] disabled:pointer-events-none disabled:opacity-40"
 					>
 						<HiMiniPlus className="size-[14px] stroke-[0.5]" />
-						<span>Create</span>
+						<span>Workspace</span>
 					</button>
 				</TooltipTrigger>
 				<TooltipContent side="bottom" sideOffset={4}>