From daa51884a9333c6de222adfa5c3918336aed351f Mon Sep 17 00:00:00 2001
From: AviPeltz <aj.peltz@gmail.com>
Date: Sat, 10 Jan 2026 10:39:21 -0800
Subject: [PATCH 1/5] organizations + move avatar

---
 .../WorkspaceSidebar/WorkspaceSidebarFooter.tsx      |  7 +++++--
 .../WorkspaceSidebarHeader.tsx                       |  5 -----
 .../ScrollToBottomButton/ScrollToBottomButton.tsx    | 12 +++++++++---
 .../ContentView/TabsContent/Terminal/Terminal.tsx    |  5 ++++-
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx
index 517c44616bd..637ed3f2be9 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarFooter.tsx
@@ -5,6 +5,7 @@ import { LuFolderOpen } from "react-icons/lu";
 import { useOpenNew } from "renderer/react-query/projects";
 import { useCreateBranchWorkspace } from "renderer/react-query/workspaces";
 import { STROKE_WIDTH } from "./constants";
+import { OrganizationDropdown } from "./WorkspaceSidebarHeader/OrganizationDropdown";
 
 interface WorkspaceSidebarFooterProps {
 	isCollapsed?: boolean;
@@ -55,7 +56,7 @@ export function WorkspaceSidebarFooter({
 
 	if (isCollapsed) {
 		return (
-			<div className="border-t border-border p-2 flex justify-center">
+			<div className="border-t border-border p-2 flex flex-col items-center gap-2">
 				<Tooltip delayDuration={300}>
 					<TooltipTrigger asChild>
 						<Button
@@ -70,12 +71,13 @@ export function WorkspaceSidebarFooter({
 					</TooltipTrigger>
 					<TooltipContent side="right">Add repository</TooltipContent>
 				</Tooltip>
+				<OrganizationDropdown isCollapsed />
 			</div>
 		);
 	}
 
 	return (
-		<div className="border-t border-border p-2">
+		<div className="border-t border-border p-2 flex flex-col gap-1">
 			<Button
 				variant="ghost"
 				size="sm"
@@ -86,6 +88,7 @@ export function WorkspaceSidebarFooter({
 				<LuFolderOpen className="w-4 h-4" strokeWidth={STROKE_WIDTH} />
 				<span>Add repository</span>
 			</Button>
+			<OrganizationDropdown />
 		</div>
 	);
 }
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
index ec8598c5c26..759dfc8e0af 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/WorkspaceSidebarHeader.tsx
@@ -19,7 +19,6 @@ import {
 } from "renderer/stores/app-state";
 import { STROKE_WIDTH, STROKE_WIDTH_THIN } from "../constants";
 import { NewWorkspaceButton } from "./NewWorkspaceButton";
-import { OrganizationDropdown } from "./OrganizationDropdown";
 
 interface WorkspaceSidebarHeaderProps {
 	isCollapsed?: boolean;
@@ -86,8 +85,6 @@ export function WorkspaceSidebarHeader({
 					<TooltipContent side="right">Toggle sidebar</TooltipContent>
 				</Tooltip>
 
-				<OrganizationDropdown isCollapsed />
-
 				<Tooltip delayDuration={300}>
 					<TooltipTrigger asChild>
 						<button
@@ -158,8 +155,6 @@ export function WorkspaceSidebarHeader({
 				<TooltipContent side="right">Toggle sidebar</TooltipContent>
 			</Tooltip>
 
-			<OrganizationDropdown />
-
 			<button
 				type="button"
 				onClick={handleClick}
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
index 4cd5fc2dae3..31f50741557 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
@@ -8,10 +8,14 @@ import { smoothScrollToBottom } from "../utils";
 
 interface ScrollToBottomButtonProps {
 	terminal: Terminal | null;
+	isHovered: boolean;
 }
 
-export function ScrollToBottomButton({ terminal }: ScrollToBottomButtonProps) {
-	const [isVisible, setIsVisible] = useState(false);
+export function ScrollToBottomButton({
+	terminal,
+	isHovered,
+}: ScrollToBottomButtonProps) {
+	const [isNotAtBottom, setIsNotAtBottom] = useState(false);
 	const shortcutText = useHotkeyText("SCROLL_TO_BOTTOM");
 	const showShortcut = shortcutText !== "Unassigned";
 
@@ -19,7 +23,7 @@ export function ScrollToBottomButton({ terminal }: ScrollToBottomButtonProps) {
 		if (!terminal) return;
 		const buffer = terminal.buffer.active;
 		const isAtBottom = buffer.viewportY >= buffer.baseY;
-		setIsVisible(!isAtBottom);
+		setIsNotAtBottom(!isAtBottom);
 	}, [terminal]);
 
 	useEffect(() => {
@@ -46,6 +50,8 @@ export function ScrollToBottomButton({ terminal }: ScrollToBottomButtonProps) {
 		}
 	};
 
+	const isVisible = isNotAtBottom && isHovered;
+
 	return (
 		<div
 			className={cn(
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx
index 5d1d21b5a2a..ccc8554a3c6 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx
@@ -44,6 +44,7 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
 	const commandBufferRef = useRef("");
 	const [subscriptionEnabled, setSubscriptionEnabled] = useState(false);
 	const [isSearchOpen, setIsSearchOpen] = useState(false);
+	const [isHovered, setIsHovered] = useState(false);
 	const [xtermInstance, setXtermInstance] = useState<XTerm | null>(null);
 	const [terminalCwd, setTerminalCwd] = useState<string | null>(null);
 	const [cwdConfirmed, setCwdConfirmed] = useState(false);
@@ -613,13 +614,15 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
 			style={{ backgroundColor: terminalBg }}
 			onDragOver={handleDragOver}
 			onDrop={handleDrop}
+			onMouseEnter={() => setIsHovered(true)}
+			onMouseLeave={() => setIsHovered(false)}
 		>
 			<TerminalSearch
 				searchAddon={searchAddonRef.current}
 				isOpen={isSearchOpen}
 				onClose={() => setIsSearchOpen(false)}
 			/>
-			<ScrollToBottomButton terminal={xtermInstance} />
+			<ScrollToBottomButton terminal={xtermInstance} isHovered={isHovered} />
 			<div ref={terminalRef} className="h-full w-full" />
 		</div>
 	);

From 3a984298541f03964baafa0e15ceeef180266cf9 Mon Sep 17 00:00:00 2001
From: AviPeltz <aj.peltz@gmail.com>
Date: Sat, 10 Jan 2026 10:47:02 -0800
Subject: [PATCH 2/5] moved over to the right

---
 .../Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
index 31f50741557..af31e938a7d 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
@@ -55,18 +55,18 @@ export function ScrollToBottomButton({
 	return (
 		<div
 			className={cn(
-				"absolute bottom-4 left-1/2 z-10 -translate-x-1/2 transition-all duration-200",
+				"absolute bottom-4 right-4 z-10 transition-all duration-200",
 				isVisible
 					? "translate-y-0 opacity-100"
 					: "pointer-events-none translate-y-2 opacity-0",
 			)}
 		>
-			<Tooltip delayDuration={500}>
+			<Tooltip delayDuration={300}>
 				<TooltipTrigger asChild>
 					<button
 						type="button"
 						onClick={handleClick}
-						className="flex size-8 items-center justify-center rounded-full border border-border bg-background text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
+						className="flex size-8 items-center justify-center rounded-full border border-border/50 bg-background/80 text-muted-foreground backdrop-blur-sm transition-colors hover:bg-muted/90 hover:text-foreground"
 					>
 						<HiArrowDown className="size-4" />
 					</button>

From a50f3796e95e7f44ec464c2d8a2fc86d64ba8b93 Mon Sep 17 00:00:00 2001
From: AviPeltz <aj.peltz@gmail.com>
Date: Sat, 10 Jan 2026 11:04:01 -0800
Subject: [PATCH 3/5] make avatar dropdown better

---
 .../OrganizationDropdown.tsx                  | 68 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
index 370f689a6f7..776076fff70 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
@@ -6,6 +6,7 @@ import {
 	DropdownMenuItem,
 	DropdownMenuLabel,
 	DropdownMenuSeparator,
+	DropdownMenuShortcut,
 	DropdownMenuSub,
 	DropdownMenuSubContent,
 	DropdownMenuSubTrigger,
@@ -13,15 +14,21 @@ import {
 } from "@superset/ui/dropdown-menu";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
 import { useLiveQuery } from "@tanstack/react-db";
+import { FaDiscord, FaXTwitter } from "react-icons/fa6";
 import {
 	HiCheck,
 	HiChevronUpDown,
 	HiOutlineArrowRightOnRectangle,
+	HiOutlineCog6Tooth,
+	HiOutlineCommandLine,
+	HiOutlineEnvelope,
+	HiOutlineUserGroup,
 } from "react-icons/hi2";
 import { useAuth } from "renderer/contexts/AuthProvider";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { trpc } from "renderer/lib/trpc";
 import { useOpenSettings } from "renderer/stores/app-state";
+import { useHotkeyText } from "renderer/stores/hotkeys";
 
 interface OrganizationDropdownProps {
 	isCollapsed?: boolean;
@@ -35,6 +42,7 @@ export function OrganizationDropdown({
 	const setActiveOrg = trpc.auth.setActiveOrganization.useMutation();
 	const signOut = trpc.auth.signOut.useMutation();
 	const openSettings = useOpenSettings();
+	const hotkeysShortcut = useHotkeyText("SHOW_HOTKEYS");
 
 	const activeOrganizationId = session?.session?.activeOrganizationId;
 
@@ -102,13 +110,30 @@ export function OrganizationDropdown({
 				{activeOrganization && (
 					<>
 						{/* Settings */}
-						<DropdownMenuItem onSelect={() => openSettings()}>
+						<DropdownMenuItem onSelect={() => openSettings()} className="gap-2">
+							<HiOutlineCog6Tooth className="h-4 w-4" />
 							<span>Settings</span>
 						</DropdownMenuItem>
 
 						{/* Team management */}
-						<DropdownMenuItem onSelect={() => openSettings("team")}>
-							<span>Invite and manage members</span>
+						<DropdownMenuItem
+							onSelect={() => openSettings("team")}
+							className="gap-2"
+						>
+							<HiOutlineUserGroup className="h-4 w-4" />
+							<span>Team</span>
+						</DropdownMenuItem>
+
+						{/* Hotkeys */}
+						<DropdownMenuItem
+							onSelect={() => openSettings("keyboard")}
+							className="gap-2"
+						>
+							<HiOutlineCommandLine className="h-4 w-4" />
+							<span className="flex-1">Hotkeys</span>
+							{hotkeysShortcut !== "Unassigned" && (
+								<DropdownMenuShortcut>{hotkeysShortcut}</DropdownMenuShortcut>
+							)}
 						</DropdownMenuItem>
 
 						<DropdownMenuSeparator />
@@ -153,6 +178,43 @@ export function OrganizationDropdown({
 					</>
 				)}
 
+				{/* Contact Us */}
+				<DropdownMenuSub>
+					<DropdownMenuSubTrigger className="gap-2">
+						<HiOutlineEnvelope className="h-4 w-4" />
+						<span>Contact us</span>
+					</DropdownMenuSubTrigger>
+					<DropdownMenuSubContent>
+						<DropdownMenuItem
+							onSelect={() =>
+								window.open("https://discord.gg/superset", "_blank")
+							}
+							className="gap-2"
+						>
+							<FaDiscord className="h-4 w-4" />
+							<span>Discord</span>
+						</DropdownMenuItem>
+						<DropdownMenuItem
+							onSelect={() =>
+								window.open("mailto:founders@superset.sh", "_blank")
+							}
+							className="gap-2"
+						>
+							<HiOutlineEnvelope className="h-4 w-4" />
+							<span>Email founders</span>
+						</DropdownMenuItem>
+						<DropdownMenuItem
+							onSelect={() => window.open("https://x.com/supersetsh", "_blank")}
+							className="gap-2"
+						>
+							<FaXTwitter className="h-4 w-4" />
+							<span>X (Twitter)</span>
+						</DropdownMenuItem>
+					</DropdownMenuSubContent>
+				</DropdownMenuSub>
+
+				<DropdownMenuSeparator />
+
 				{/* Sign out - ALWAYS show so users can never get trapped */}
 				<DropdownMenuItem onSelect={handleSignOut} className="gap-2">
 					<HiOutlineArrowRightOnRectangle className="h-4 w-4" />

From c27168eb72ff182d0cf02140423906779fedc341 Mon Sep 17 00:00:00 2001
From: AviPeltz <aj.peltz@gmail.com>
Date: Sat, 10 Jan 2026 11:07:59 -0800
Subject: [PATCH 4/5] fix accessibility

---
 .../Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
index af31e938a7d..868f8bb627a 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/ScrollToBottomButton/ScrollToBottomButton.tsx
@@ -60,12 +60,14 @@ export function ScrollToBottomButton({
 					? "translate-y-0 opacity-100"
 					: "pointer-events-none translate-y-2 opacity-0",
 			)}
+			aria-hidden={!isVisible}
 		>
 			<Tooltip delayDuration={300}>
 				<TooltipTrigger asChild>
 					<button
 						type="button"
 						onClick={handleClick}
+						tabIndex={isVisible ? 0 : -1}
 						className="flex size-8 items-center justify-center rounded-full border border-border/50 bg-background/80 text-muted-foreground backdrop-blur-sm transition-colors hover:bg-muted/90 hover:text-foreground"
 					>
 						<HiArrowDown className="size-4" />

From 795911e1efd1d65e1255ad1aef5eb53d0aca24ce Mon Sep 17 00:00:00 2001
From: AviPeltz <aj.peltz@gmail.com>
Date: Sat, 10 Jan 2026 11:20:11 -0800
Subject: [PATCH 5/5] fixed coderabbit ish

---
 .../WorkspaceSidebarHeader/OrganizationDropdown.tsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
index 776076fff70..13c0944e0d6 100644
--- a/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
+++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceSidebar/WorkspaceSidebarHeader/OrganizationDropdown.tsx
@@ -28,7 +28,7 @@ import { useAuth } from "renderer/contexts/AuthProvider";
 import { useCollections } from "renderer/contexts/CollectionsProvider";
 import { trpc } from "renderer/lib/trpc";
 import { useOpenSettings } from "renderer/stores/app-state";
-import { useHotkeyText } from "renderer/stores/hotkeys";
+import { useHotkeyText } from "renderer/stores/hotkeys/store";
 
 interface OrganizationDropdownProps {
 	isCollapsed?: boolean;
@@ -41,6 +41,7 @@ export function OrganizationDropdown({
 	const collections = useCollections();
 	const setActiveOrg = trpc.auth.setActiveOrganization.useMutation();
 	const signOut = trpc.auth.signOut.useMutation();
+	const openUrl = trpc.external.openUrl.useMutation();
 	const openSettings = useOpenSettings();
 	const hotkeysShortcut = useHotkeyText("SHOW_HOTKEYS");
 
@@ -186,25 +187,21 @@ export function OrganizationDropdown({
 					</DropdownMenuSubTrigger>
 					<DropdownMenuSubContent>
 						<DropdownMenuItem
-							onSelect={() =>
-								window.open("https://discord.gg/superset", "_blank")
-							}
+							onSelect={() => openUrl.mutate("https://discord.gg/superset")}
 							className="gap-2"
 						>
 							<FaDiscord className="h-4 w-4" />
 							<span>Discord</span>
 						</DropdownMenuItem>
 						<DropdownMenuItem
-							onSelect={() =>
-								window.open("mailto:founders@superset.sh", "_blank")
-							}
+							onSelect={() => openUrl.mutate("mailto:founders@superset.sh")}
 							className="gap-2"
 						>
 							<HiOutlineEnvelope className="h-4 w-4" />
 							<span>Email founders</span>
 						</DropdownMenuItem>
 						<DropdownMenuItem
-							onSelect={() => window.open("https://x.com/supersetsh", "_blank")}
+							onSelect={() => openUrl.mutate("https://x.com/supersetsh")}
 							className="gap-2"
 						>
 							<FaXTwitter className="h-4 w-4" />