From 6b0e436bee6fc11095a509461d9c094e9df93517 Mon Sep 17 00:00:00 2001
From: Ishaan Gupta <ishaankone@gmail.com>
Date: Thu, 28 May 2026 16:41:10 +0530
Subject: [PATCH] remove the dropdown icon

---
 apps/web/components/settings/account.tsx | 149 ++---------------------
 1 file changed, 9 insertions(+), 140 deletions(-)

diff --git a/apps/web/components/settings/account.tsx b/apps/web/components/settings/account.tsx
index 9de7124b..7cbbbee9 100644
--- a/apps/web/components/settings/account.tsx
+++ b/apps/web/components/settings/account.tsx
@@ -4,15 +4,8 @@ import { dmSans125ClassName } from "@/lib/fonts"
 import { cn } from "@lib/utils"
 import { useAuth } from "@lib/auth-context"
 import { authClient } from "@lib/auth"
-import { useOrgSummaries } from "@/hooks/use-org-summaries"
-import { OrgPlanBadge, resolveOrgPlan } from "@/components/org-plan-badge"
 import { Avatar, AvatarFallback, AvatarImage } from "@ui/components/avatar"
-import {
-	PLAN_RANK,
-	useTokenUsage,
-	type PlanType,
-} from "@/hooks/use-token-usage"
-import { Popover, PopoverContent, PopoverTrigger } from "@ui/components/popover"
+import { Popover, PopoverContent } from "@ui/components/popover"
 import {
 	Select,
 	SelectContent,
@@ -28,13 +21,10 @@ import {
 } from "@ui/components/dropdown-menu"
 import { Dialog, DialogContent, DialogTitle } from "@ui/components/dialog"
 import * as DialogPrimitive from "@radix-ui/react-dialog"
-import { useCustomer } from "autumn-js/react"
 import { useMutation, useQuery } from "@tanstack/react-query"
 import {
-	Check,
 	LoaderIcon,
 	ChevronDown,
-	Building2,
 	Users,
 	UserPlus,
 	Mail,
@@ -139,14 +129,9 @@ export default function Account() {
 	const {
 		user,
 		org,
-		organizations: allOrgs,
-		setActiveOrg,
 		refetchActiveOrg,
 		refetchOrganizations,
 	} = useAuth()
-	const autumn = useCustomer()
-	const [switchingOrgId, setSwitchingOrgId] = useState<string | null>(null)
-	const [orgMenuOpen, setOrgMenuOpen] = useState(false)
 	const [inviteDialogOpen, setInviteDialogOpen] = useState(false)
 	const [inviteEmail, setInviteEmail] = useState("")
 	const [inviteRole, setInviteRole] = useState<InviteRole>("member")
@@ -178,22 +163,6 @@ export default function Account() {
 	const showAccessType = inviteRole === "member"
 	const showTagPicker =
 		inviteRole === "member" && inviteAccessType === "restricted"
-	const canSwitchOrg = (allOrgs?.length ?? 0) > 1
-	const { data: orgSummaries } = useOrgSummaries()
-
-	const handleOrgSwitch = async (orgSlug: string, orgId: string) => {
-		if (orgId === org?.id) return
-		setSwitchingOrgId(orgId)
-		try {
-			await setActiveOrg(orgSlug)
-			window.location.reload()
-		} catch (error) {
-			console.error("Failed to switch organization:", error)
-			setSwitchingOrgId(null)
-		}
-	}
-
-	const { currentPlan } = useTokenUsage(autumn)
 
 	useEffect(() => {
 		setOrgNameDraft(org?.name ?? "")
@@ -402,35 +371,6 @@ export default function Account() {
 		updateOrgNameMutation.mutate(trimmed)
 	}
 
-	const planByOrgId = useMemo(() => {
-		const map = new Map<string, PlanType>()
-		for (const summary of orgSummaries ?? []) {
-			map.set(summary.orgId, summary.plan)
-		}
-		return map
-	}, [orgSummaries])
-
-	const sortedOrgsForMenu = useMemo(() => {
-		if (!allOrgs?.length) return []
-		return [...allOrgs].sort((a, b) => {
-			const planA = resolveOrgPlan(
-				a.id,
-				a.id === org?.id,
-				currentPlan,
-				planByOrgId,
-			)
-			const planB = resolveOrgPlan(
-				b.id,
-				b.id === org?.id,
-				currentPlan,
-				planByOrgId,
-			)
-			const rankDiff = PLAN_RANK[planB] - PLAN_RANK[planA]
-			if (rankDiff !== 0) return rankDiff
-			return a.name.localeCompare(b.name)
-		})
-	}, [allOrgs, org?.id, currentPlan, planByOrgId])
-
 	const memberSince = user?.createdAt
 		? new Date(user.createdAt).toLocaleDateString("en-US", {
 				month: "short",
@@ -542,85 +482,14 @@ export default function Account() {
 									</form>
 								) : (
 									<div className="flex min-w-0 max-w-full items-center gap-2">
-										{canSwitchOrg ? (
-											<Popover open={orgMenuOpen} onOpenChange={setOrgMenuOpen}>
-												<PopoverTrigger
-													className={cn(
-														"flex min-w-0 max-w-full items-center gap-2 transition-opacity",
-														"cursor-pointer hover:opacity-90",
-														dmSans125ClassName(),
-													)}
-												>
-													<span
-														className={cn(
-															dmSans125ClassName(),
-															"truncate font-medium text-[16px] tracking-[-0.16px] text-[#FAFAFA]",
-														)}
-													>
-														{org?.name ?? "Personal"}
-													</span>
-													<ChevronDown className="size-4 shrink-0 text-[#737373]" />
-												</PopoverTrigger>
-												<PopoverContent
-													align="start"
-													className="w-80 max-h-80 overflow-y-auto bg-[#1B1F24] rounded-[12px] border-white/10 p-1.5 shadow-[0px_4px_16px_rgba(0,0,0,0.4)]"
-												>
-													{sortedOrgsForMenu.map((organization) => {
-														const isCurrent = organization.id === org?.id
-														const isSwitching = switchingOrgId === organization.id
-														const plan = resolveOrgPlan(
-															organization.id,
-															isCurrent,
-															currentPlan,
-															planByOrgId,
-														)
-														return (
-															<button
-																key={organization.id}
-																type="button"
-																disabled={isCurrent || isSwitching}
-																onClick={() =>
-																	handleOrgSwitch(
-																		organization.slug,
-																		organization.id,
-																	)
-																}
-																className={cn(
-																	"w-full flex items-center gap-3 px-3 py-2.5 rounded-[8px] text-left transition-colors",
-																	isCurrent
-																		? "bg-white/5"
-																		: "hover:bg-white/5 cursor-pointer",
-																	"disabled:opacity-60 disabled:cursor-default",
-																	dmSans125ClassName(),
-																)}
-															>
-																<Building2 className="size-4 text-[#737373] shrink-0" />
-																<p className="min-w-0 flex-1 truncate text-[14px] tracking-[-0.14px] text-[#FAFAFA]">
-																	{organization.name}
-																</p>
-																{isSwitching ? (
-																	<LoaderIcon className="size-4 shrink-0 animate-spin text-[#4BA0FA]" />
-																) : isCurrent ? (
-																	<Check className="size-4 shrink-0 text-[#4BA0FA]" />
-																) : (
-																	<span className="size-4 shrink-0" aria-hidden />
-																)}
-																<OrgPlanBadge plan={plan} />
-															</button>
-														)
-													})}
-												</PopoverContent>
-											</Popover>
-										) : (
-											<span
-												className={cn(
-													dmSans125ClassName(),
-													"truncate font-medium text-[16px] tracking-[-0.16px] text-[#FAFAFA]",
-												)}
-											>
-												{org?.name ?? "Personal"}
-											</span>
-										)}
+										<span
+											className={cn(
+												dmSans125ClassName(),
+												"truncate font-medium text-[16px] tracking-[-0.16px] text-[#FAFAFA]",
+											)}
+										>
+											{org?.name ?? "Personal"}
+										</span>
 										{canManageTeam ? (
 											<button
 												type="button"