Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Remove deprecated Icon wrapper component (#3099)
Luke Vella60e81b693ddc
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsxindex fe8d55f8f..342d03992 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsx@@ -1,6 +1,5 @@"use client";-import { Icon } from "@rallly/ui/icon";import { StickerIcon } from "lucide-react";import React from "react";import { Spinner } from "@/components/spinner";@@ -125,9 +124,7 @@ export function EventsInfiniteList({{!hasNextPage && data.pages.length > 1 && (<div className="flex items-center justify-center gap-2 py-4 text-muted-foreground text-sm">- <Icon>- <StickerIcon />- </Icon>+ <StickerIcon className="size-4 shrink-0 text-muted-foreground" /><Transi18nKey="endOfList"defaults="You've reached the end of the list"diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsxindex 62625e4f7..512c434ff 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx@@ -18,7 +18,6 @@ import {FormLabel,FormMessage,} from "@rallly/ui/form";-import { Icon } from "@rallly/ui/icon";import { Input } from "@rallly/ui/input";import {Select,@@ -166,9 +165,7 @@ export function InviteMemberForm({ onSuccess }: { onSuccess?: () => void }) {</FormLabel><Tooltip><TooltipTrigger type="button">- <Icon>- <InfoIcon />- </Icon>+ <InfoIcon className="size-4 shrink-0 text-muted-foreground" /></TooltipTrigger><TooltipContent align="start" side="right"><div className="w-60 space-y-3">diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsxindex bb984cef7..df658b743 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx@@ -18,7 +18,6 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import { toast } from "@rallly/ui/sonner";import { MoreVerticalIcon, ShieldIcon, UserIcon, XIcon } from "lucide-react";import {@@ -82,9 +81,7 @@ export function MemberDropdownMenu({/>}>- <Icon>- <MoreVerticalIcon />- </Icon>+ <MoreVerticalIcon className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContent align="end">{member.role === "member" ? (@@ -92,9 +89,7 @@ export function MemberDropdownMenu({onClick={() => handleRoleChange("admin")}disabled={!canUpdate}>- <Icon>- <ShieldIcon className="size-4" />- </Icon>+ <ShieldIcon className="size-4" /><Trans i18nKey="makeAdmin" defaults="Make admin" /></DropdownMenuItem>) : (@@ -102,9 +97,7 @@ export function MemberDropdownMenu({onClick={() => handleRoleChange("member")}disabled={!canUpdate}>- <Icon>- <UserIcon />- </Icon>+ <UserIcon /><Trans i18nKey="makeMember" defaults="Make member" /></DropdownMenuItem>)}diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsxindex a1e3c2380..6b5e8829c 100644--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx@@ -1,7 +1,6 @@"use client";import { Badge } from "@rallly/ui/badge";-import { Icon } from "@rallly/ui/icon";import { KeyIcon } from "lucide-react";import {EmptyState,@@ -45,9 +44,7 @@ export function ApiKeysList({ apiKeys }: { apiKeys: ApiKey[] }) {<StackedListItem key={apiKey.id}><div className="flex flex-1 items-center gap-4"><div className="flex size-10 items-center justify-center rounded-lg border bg-card-accent">- <Icon>- <KeyIcon />- </Icon>+ <KeyIcon className="size-4 shrink-0 text-muted-foreground" /></div><div><div className="flex items-center gap-2">diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-usage-limits.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-usage-limits.tsxindex 3c0a23954..b933fe808 100644--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-usage-limits.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-usage-limits.tsx@@ -1,6 +1,5 @@"use client";-import { Icon } from "@rallly/ui/icon";import { ArrowUpRightIcon } from "lucide-react";import Link from "next/link";import {@@ -31,9 +30,7 @@ export function ApiUsageLimits() {className="inline-flex items-center gap-1 text-primary text-sm underline-offset-4 hover:underline"><Trans i18nKey="apiViewDocs" defaults="View API docs" />- <Icon>- <ArrowUpRightIcon />- </Icon>+ <ArrowUpRightIcon className="size-4 shrink-0 text-muted-foreground" /></Link></div>);diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsxindex 310a0401e..d5bdbe2dd 100644--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsx@@ -17,7 +17,6 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import { toast } from "@rallly/ui/sonner";import { BanIcon, MoreVerticalIcon } from "lucide-react";import { revokeApiKeyAction } from "@/features/api-keys/actions";@@ -54,9 +53,7 @@ export function RevokeApiKeyButton({/>}>- <Icon>- <MoreVerticalIcon />- </Icon>+ <MoreVerticalIcon className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuItemdiff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/contact-support-link.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/contact-support-link.tsxindex e1a19562d..177cbb2ff 100644--- a/apps/web/src/app/[locale]/(space)/settings/billing/components/contact-support-link.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/billing/components/contact-support-link.tsx@@ -2,7 +2,6 @@import { posthog } from "@rallly/posthog/client";import { buttonVariants } from "@rallly/ui";-import { Icon } from "@rallly/ui/icon";import { SendIcon } from "lucide-react";import { Trans } from "@/i18n/client";@@ -16,9 +15,7 @@ export function ContactSupportLink() {posthog?.capture("space_billing:support_button_click");}}>- <Icon>- <SendIcon />- </Icon>+ <SendIcon className="text-muted-foreground" /><Trans i18nKey="contactSupport" defaults="Contact support" /></a><p className="text-muted-foreground text-sm">diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/pro-plan-card.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/pro-plan-card.tsxindex 8a796919c..a7b2158b8 100644--- a/apps/web/src/app/[locale]/(space)/settings/billing/components/pro-plan-card.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/billing/components/pro-plan-card.tsx@@ -3,7 +3,6 @@import { posthog } from "@rallly/posthog/client";import { Button } from "@rallly/ui/button";import { DialogTrigger } from "@rallly/ui/dialog";-import { Icon } from "@rallly/ui/icon";import { ArmchairIcon, CreditCardIcon, DotIcon } from "lucide-react";import { openCustomerPortalAction } from "@/features/billing/actions";import { SubscriptionStatusBadge } from "@/features/billing/components/subscription-status-badge";@@ -107,9 +106,7 @@ export function ProPlanCard({defaults="{count, plural, one {# seat} other {# seats}}"values={{ count: seats }}/>- <Icon>- <DotIcon />- </Icon>+ <DotIcon className="size-4 shrink-0 text-muted-foreground" />{endsAtPeriodEnd ? (<Transi18nKey="subscriptionCardEndsOn"@@ -169,9 +166,7 @@ export function ProPlanCard({openCustomerPortal.execute({});}}>- <Icon>- <CreditCardIcon />- </Icon>+ <CreditCardIcon className="text-muted-foreground" /><Transi18nKey="manageSubscription"defaults="Manage subscription"@@ -187,9 +182,7 @@ export function ProPlanCard({/>}>- <Icon>- <ArmchairIcon />- </Icon>+ <ArmchairIcon className="text-muted-foreground" /><Trans i18nKey="manageSeats" defaults="Manage seats" /></DialogTrigger></ManageSeatsDialog>diff --git a/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsx b/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsxindex 0d51ea92f..46b012899 100644--- a/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsx@@ -7,7 +7,6 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import { toast } from "@rallly/ui/sonner";import { Switch } from "@rallly/ui/switch";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";@@ -94,9 +93,7 @@ export function CalendarConnectionList() {);}}>- <Icon>- <RefreshCcwIcon />- </Icon>+ <RefreshCcwIcon className="text-muted-foreground" /></Button>}/>@@ -116,9 +113,7 @@ export function CalendarConnectionList() {/>}>- <Icon>- <MoreVerticalIcon />- </Icon>+ <MoreVerticalIcon className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuItemdiff --git a/apps/web/src/app/[locale]/(space)/settings/event-types/event-types-settings-page.tsx b/apps/web/src/app/[locale]/(space)/settings/event-types/event-types-settings-page.tsxindex f8c0714a3..a3e12aa9c 100644--- a/apps/web/src/app/[locale]/(space)/settings/event-types/event-types-settings-page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/event-types/event-types-settings-page.tsx@@ -10,7 +10,6 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import {ArmchairIcon,CalendarRangeIcon,@@ -114,9 +113,7 @@ function EventTypeCard({/>}>- <Icon>- <MoreVerticalIcon />- </Icon>+ <MoreVerticalIcon className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuItem onClick={onEdit}>diff --git a/apps/web/src/app/[locale]/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsxindex f63b2fbc1..a8d3548db 100644--- a/apps/web/src/app/[locale]/(space)/settings/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/layout.tsx@@ -1,5 +1,4 @@import { buttonVariants } from "@rallly/ui";-import { Icon } from "@rallly/ui/icon";import {Sidebar,SidebarContent,@@ -42,9 +41,7 @@ export default function Layout({ children }: { children?: React.ReactNode }) {size: "icon",})}>- <Icon>- <ArrowLeftIcon />- </Icon>+ <ArrowLeftIcon className="text-muted-foreground" /><span className="sr-only"><Trans i18nKey="back" defaults="Back" /></span>@@ -87,9 +84,7 @@ export default function Layout({ children }: { children?: React.ReactNode }) {<div className="flex items-center gap-4"><SidebarTrigger /><div className="flex items-center gap-2">- <Icon>- <SettingsIcon />- </Icon>+ <SettingsIcon className="size-4 shrink-0 text-muted-foreground" /><span className="font-medium text-sm"><Trans i18nKey="settings" defaults="Settings" /></span>diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/components/account-deletion-summary.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/components/account-deletion-summary.tsxindex 0d3afd5a2..a9a3f0aad 100644--- a/apps/web/src/app/[locale]/(space)/settings/profile/components/account-deletion-summary.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/profile/components/account-deletion-summary.tsx@@ -1,5 +1,4 @@import { Alert, AlertDescription } from "@rallly/ui/alert";-import { Icon } from "@rallly/ui/icon";import { Skeleton } from "@rallly/ui/skeleton";import { BarChart2Icon, CalendarIcon, InfoIcon } from "lucide-react";import { getAccountDeletionSummary } from "@/features/user/account-deletion/data";@@ -28,9 +27,7 @@ export async function AccountDeletionSummary() {<ul className="space-y-2">{activePollCount > 0 ? (<li className="flex items-center gap-x-2">- <Icon>- <BarChart2Icon />- </Icon>+ <BarChart2Icon className="size-4 shrink-0 text-muted-foreground" /><Transi18nKey="deleteAccountActivePolls"defaults="{count, plural, one {# active poll} other {# active polls}}"@@ -40,9 +37,7 @@ export async function AccountDeletionSummary() {) : null}{upcomingEventCount > 0 ? (<li className="flex items-center gap-x-2">- <Icon>- <CalendarIcon />- </Icon>+ <CalendarIcon className="size-4 shrink-0 text-muted-foreground" /><Transi18nKey="deleteAccountUpcomingEvents"defaults="{count, plural, one {# upcoming event} other {# upcoming events}}"diff --git a/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsxindex 73ef2bfdc..4bea668dd 100644--- a/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsx@@ -9,7 +9,6 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import { toast } from "@rallly/ui/sonner";import { CrownIcon, LayersIcon, MoreVerticalIcon } from "lucide-react";import { useState } from "react";@@ -108,9 +107,7 @@ export function SpacesList({ spaces, currentUserId }: SpacesListProps) {/>}>- <Icon>- <MoreVerticalIcon />- </Icon>+ <MoreVerticalIcon className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuItemdiff --git a/apps/web/src/app/[locale]/control-panel/layout.tsx b/apps/web/src/app/[locale]/control-panel/layout.tsxindex c892b6404..bb87455fa 100644--- a/apps/web/src/app/[locale]/control-panel/layout.tsx+++ b/apps/web/src/app/[locale]/control-panel/layout.tsx@@ -1,4 +1,3 @@-import { Icon } from "@rallly/ui/icon";import { SidebarInset, SidebarTrigger } from "@rallly/ui/sidebar";import { GaugeIcon } from "lucide-react";import type { Metadata } from "next";@@ -38,9 +37,7 @@ async function AdminGate({ children }: { children: React.ReactNode }) {<div className="flex items-center gap-4"><SidebarTrigger /><div className="flex items-center gap-2">- <Icon>- <GaugeIcon />- </Icon>+ <GaugeIcon className="size-4 shrink-0 text-muted-foreground" /><span className="font-medium text-sm"><Trans i18nKey="controlPanel" defaults="Control Panel" /></span>diff --git a/apps/web/src/app/[locale]/control-panel/page.tsx b/apps/web/src/app/[locale]/control-panel/page.tsxindex ecf4224e9..ff3567f26 100644--- a/apps/web/src/app/[locale]/control-panel/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/page.tsx@@ -1,5 +1,4 @@import { cn } from "@rallly/ui";-import { Icon } from "@rallly/ui/icon";import { Tile, TileGrid, TileTitle } from "@rallly/ui/tile";import {InfinityIcon,@@ -76,9 +75,7 @@ export default async function AdminPage() {/>/{userLimit === Number.POSITIVE_INFINITY ? (- <Icon className="inline-flex">- <InfinityIcon />- </Icon>+ <InfinityIcon className="inline-flex size-4 shrink-0 text-muted-foreground" />) : (userLimit)}diff --git a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx b/apps/web/src/app/[locale]/control-panel/users/user-row.tsxindex 7bd0be88e..36373abf3 100644--- a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx+++ b/apps/web/src/app/[locale]/control-panel/users/user-row.tsx@@ -15,7 +15,6 @@ import {DropdownMenuSubTrigger,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import {BanIcon,MoreHorizontal,@@ -95,16 +94,12 @@ export function UserRow({/>}>- <Icon>- <MoreHorizontal />- </Icon>+ <MoreHorizontal className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuSub><DropdownMenuSubTrigger disabled={!canChangeRole}>- <Icon>- <UserPenIcon />- </Icon>+ <UserPenIcon /><Trans i18nKey="changeRole" defaults="Change role" /></DropdownMenuSubTrigger><DropdownMenuSubContent>@@ -138,9 +133,7 @@ export function UserRow({}}disabled={!canBan}>- <Icon>- <UserCheckIcon />- </Icon>+ <UserCheckIcon /><Trans i18nKey="unbanUser" defaults="Unban user" /></DropdownMenuItem>) : (diff --git a/apps/web/src/app/[locale]/quick-create/page.tsx b/apps/web/src/app/[locale]/quick-create/page.tsxindex af6bfd7df..b7df4c851 100644--- a/apps/web/src/app/[locale]/quick-create/page.tsx+++ b/apps/web/src/app/[locale]/quick-create/page.tsx@@ -1,6 +1,5 @@import { buttonVariants } from "@rallly/ui";import { Card } from "@rallly/ui/card";-import { Icon } from "@rallly/ui/icon";import { LogInIcon } from "lucide-react";import type { Metadata } from "next";import Link from "next/link";@@ -43,9 +42,7 @@ export default async function QuickCreatePage() {href="/login"className={buttonVariants({ className: "rounded-full" })}>- <Icon>- <LogInIcon />- </Icon>+ <LogInIcon className="text-muted-foreground" />{t("login")}</Link></div>diff --git a/apps/web/src/components/copy-link-button.tsx b/apps/web/src/components/copy-link-button.tsxindex 1dd48e649..324bdea70 100644--- a/apps/web/src/components/copy-link-button.tsx+++ b/apps/web/src/components/copy-link-button.tsx@@ -1,7 +1,6 @@"use client";import { Button } from "@rallly/ui/button";-import { Icon } from "@rallly/ui/icon";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import { CheckIcon, CopyIcon } from "lucide-react";import { useState } from "react";@@ -34,9 +33,7 @@ export function CopyLinkButton({setTimeout(() => setDidCopy(false), 1000);}}>- <Icon>- <CopyIcon />- </Icon>+ <CopyIcon className="text-muted-foreground" /></Button>}/>diff --git a/apps/web/src/components/empty-state.tsx b/apps/web/src/components/empty-state.tsxindex 2a589091f..5559aba5b 100644--- a/apps/web/src/components/empty-state.tsx+++ b/apps/web/src/components/empty-state.tsx@@ -1,5 +1,4 @@import { cn } from "@rallly/ui";-import { Icon } from "@rallly/ui/icon";export function EmptyState({children,@@ -25,8 +24,8 @@ export function EmptyStateIcon({ children }: { children: React.ReactNode }) {<div className="relative mb-4 inline-block"><div className="absolute top-0 right-0 bottom-2 -left-1.5 origin-bottom -rotate-12 scale-95 rounded-xl bg-card opacity-75 shadow-xs ring-1 ring-button-outline ring-inset" /><div className="absolute top-0 -right-1.5 bottom-2 left-0 origin-bottom rotate-12 scale-95 rounded-xl bg-card opacity-75 shadow-xs ring-1 ring-button-outline ring-inset" />- <div className="relative inline-flex rounded-xl bg-card p-3 shadow-xs ring-1 ring-button-outline ring-inset">- <Icon size="lg">{children}</Icon>+ <div className="relative inline-flex rounded-xl bg-card p-3 shadow-xs ring-1 ring-button-outline ring-inset [&_svg]:size-5 [&_svg]:shrink-0 [&_svg]:text-muted-foreground">+ {children}</div></div>);diff --git a/apps/web/src/components/language-selector.tsx b/apps/web/src/components/language-selector.tsxindex a867d3b28..568a991ea 100644--- a/apps/web/src/components/language-selector.tsx+++ b/apps/web/src/components/language-selector.tsx@@ -1,5 +1,4 @@import languages from "@rallly/languages";-import { Icon } from "@rallly/ui/icon";import {Select,SelectContent,@@ -29,9 +28,7 @@ export const LanguageSelect: React.FunctionComponent<{}}><SelectTrigger id={id} className={className} {...ariaProps}>- <Icon>- <LanguagesIcon />- </Icon>+ <LanguagesIcon className="size-4 shrink-0 text-muted-foreground" /><SelectValue /></SelectTrigger><SelectContent>diff --git a/apps/web/src/components/member-selector.tsx b/apps/web/src/components/member-selector.tsxindex dbb7bb8c3..4d08a5d80 100644--- a/apps/web/src/components/member-selector.tsx+++ b/apps/web/src/components/member-selector.tsx@@ -1,6 +1,5 @@"use client";-import { Icon } from "@rallly/ui/icon";import {Select,SelectContent,@@ -47,9 +46,7 @@ export function MemberSelector({ members }: MemberSelectorProps) {value: "all",label: (<div className="flex items-center gap-2">- <Icon>- <UsersIcon />- </Icon>+ <UsersIcon className="size-4 shrink-0 text-muted-foreground" /><span><Trans i18nKey="allMembers" defaults="All" /></span>diff --git a/apps/web/src/components/optimized-avatar-image.tsx b/apps/web/src/components/optimized-avatar-image.tsxindex f9d58de69..4ca91cfd4 100644--- a/apps/web/src/components/optimized-avatar-image.tsx+++ b/apps/web/src/components/optimized-avatar-image.tsx@@ -1,6 +1,5 @@import { cn } from "@rallly/ui";import { Avatar, AvatarFallback, AvatarImage } from "@rallly/ui/avatar";-import { Icon } from "@rallly/ui/icon";import { UserIcon } from "lucide-react";import { resolveStorageUrl } from "@/lib/storage/resolve-storage-url";@@ -31,9 +30,7 @@ export function OptimizedAvatarImage({{/^\p{L}+$/u.test(initials) ? (initials) : (- <Icon>- <UserIcon />- </Icon>+ <UserIcon className="size-4 shrink-0 text-muted-foreground" />)}</AvatarFallback></Avatar>diff --git a/apps/web/src/components/pagination.tsx b/apps/web/src/components/pagination.tsxindex facf8e47f..bbb8ed073 100644--- a/apps/web/src/components/pagination.tsx+++ b/apps/web/src/components/pagination.tsx@@ -2,7 +2,6 @@import { cn } from "@rallly/ui";import { Button } from "@rallly/ui/button";-import { Icon } from "@rallly/ui/icon";import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";import { usePathname, useRouter, useSearchParams } from "next/navigation";@@ -68,9 +67,7 @@ export function Pagination({onClick={handlePreviousPage}disabled={currentPage === 1}>- <Icon>- <ChevronLeftIcon />- </Icon>+ <ChevronLeftIcon className="text-muted-foreground" /><span className="sr-only"><Trans i18nKey="paginationPrevious" defaults="Previous" /></span>@@ -94,9 +91,7 @@ export function Pagination({<span className="sr-only"><Trans i18nKey="paginationNext" defaults="Next" /></span>- <Icon>- <ChevronRightIcon />- </Icon>+ <ChevronRightIcon className="text-muted-foreground" /></Button></div></div>diff --git a/apps/web/src/components/search-input.tsx b/apps/web/src/components/search-input.tsxindex df022b574..a3948dfbc 100644--- a/apps/web/src/components/search-input.tsx+++ b/apps/web/src/components/search-input.tsx@@ -1,6 +1,5 @@"use client";-import { Icon } from "@rallly/ui/icon";import { Input } from "@rallly/ui/input";import debounce from "lodash/debounce";import { SearchIcon } from "lucide-react";@@ -55,9 +54,7 @@ export function SearchInput({ placeholder }: { placeholder: string }) {}}><div className="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-2.5">- <Icon>- <SearchIcon />- </Icon>+ <SearchIcon className="size-4 shrink-0 text-muted-foreground" /></div><Inputref={inputRef}diff --git a/apps/web/src/features/auth/components/sso-provider.tsx b/apps/web/src/features/auth/components/sso-provider.tsxindex d54b3942a..101f77dd5 100644--- a/apps/web/src/features/auth/components/sso-provider.tsx+++ b/apps/web/src/features/auth/components/sso-provider.tsx@@ -1,6 +1,5 @@"use client";import { Button } from "@rallly/ui/button";-import { Icon } from "@rallly/ui/icon";import { UserIcon } from "lucide-react";import Image from "next/image";@@ -17,11 +16,7 @@ function SSOImage({ provider }: { provider: string }) {}if (provider === "oidc") {- return (- <Icon>- <UserIcon />- </Icon>- );+ return <UserIcon className="text-muted-foreground" />;}return null;diff --git a/apps/web/src/features/billing/components/pay-wall-dialog.tsx b/apps/web/src/features/billing/components/pay-wall-dialog.tsxindex f8f6eebd1..d0c4aaed6 100644--- a/apps/web/src/features/billing/components/pay-wall-dialog.tsx+++ b/apps/web/src/features/billing/components/pay-wall-dialog.tsx@@ -10,7 +10,6 @@ import {DialogHeader,DialogTitle,} from "@rallly/ui/dialog";-import { Icon } from "@rallly/ui/icon";import { Label } from "@rallly/ui/label";import { RadioGroup, RadioGroupItem } from "@rallly/ui/radio-group";import { Switch } from "@rallly/ui/switch";@@ -51,8 +50,8 @@ function KeyBenefitsItem({}) {return (<li className="flex items-center gap-3">- <div className="mt-1.5 inline-flex size-9 items-center justify-center rounded-lg border bg-muted text-muted-foreground">- <Icon>{icon}</Icon>+ <div className="mt-1.5 inline-flex size-9 items-center justify-center rounded-lg border bg-muted text-muted-foreground [&_svg]:size-4 [&_svg]:shrink-0 [&_svg]:text-muted-foreground">+ {icon}</div><div><div className="mt-2 font-medium text-sm">{title}</div>diff --git a/apps/web/src/features/calendars/components/add-to-calendar-menu-items.tsx b/apps/web/src/features/calendars/components/add-to-calendar-menu-items.tsxindex 88477a72b..0715af8ef 100644--- a/apps/web/src/features/calendars/components/add-to-calendar-menu-items.tsx+++ b/apps/web/src/features/calendars/components/add-to-calendar-menu-items.tsx@@ -4,7 +4,6 @@ import {DropdownMenuItem,DropdownMenuSeparator,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import { DownloadIcon } from "lucide-react";import GoogleCalendarIcon from "@/features/calendars/assets/google-calendar.svg";import Microsoft365Icon from "@/features/calendars/assets/microsoft-365.svg";@@ -71,9 +70,7 @@ export function AddToCalendarMenuItems({ eventId }: { eventId: string }) {<DropdownMenuItemrender={<a href={`/api/event/${eventId}/ics`} download />}>- <Icon>- <DownloadIcon />- </Icon>+ <DownloadIcon /><Trans i18nKey="downloadICSFile" defaults="Download ICS file" /></DropdownMenuItem></>diff --git a/apps/web/src/features/licensing/components/refresh-license-button.tsx b/apps/web/src/features/licensing/components/refresh-license-button.tsxindex 7ac0d0148..99e7e459a 100644--- a/apps/web/src/features/licensing/components/refresh-license-button.tsx+++ b/apps/web/src/features/licensing/components/refresh-license-button.tsx@@ -1,7 +1,6 @@"use client";import { Button } from "@rallly/ui/button";-import { Icon } from "@rallly/ui/icon";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import { RefreshCwIcon } from "lucide-react";import { Trans } from "@/i18n/client";@@ -20,9 +19,7 @@ export function RefreshLicenseButton() {loading={refreshInstanceLicense.isExecuting}onClick={async () => await refreshInstanceLicense.executeAsync()}>- <Icon>- <RefreshCwIcon />- </Icon>+ <RefreshCwIcon className="text-muted-foreground" /><span className="sr-only"><Trans i18nKey="refreshLicense" defaults="Refresh license" /></span>diff --git a/apps/web/src/features/navigation/components/command-menu/command-menu.tsx b/apps/web/src/features/navigation/components/command-menu/command-menu.tsxindex 3932ebf0e..59781481f 100644--- a/apps/web/src/features/navigation/components/command-menu/command-menu.tsx+++ b/apps/web/src/features/navigation/components/command-menu/command-menu.tsx@@ -9,7 +9,6 @@ import {CommandList,} from "@rallly/ui/command";import { useDialog } from "@rallly/ui/dialog";-import { Icon } from "@rallly/ui/icon";import { PlusIcon } from "lucide-react";import { useRouter } from "next/navigation";import {@@ -72,9 +71,7 @@ export function CommandMenu() {heading={<Trans i18nKey="commandMenuActions" defaults="Actions" />}><CommandItem onSelect={() => handleSelect("/new")}>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon className="size-4 shrink-0 text-muted-foreground" /><Trans i18nKey="createNewPoll" defaults="Create new poll" /></CommandItem></CommandGroup>diff --git a/apps/web/src/features/poll/components/desktop-poll.tsx b/apps/web/src/features/poll/components/desktop-poll.tsxindex f2c750ad3..46a913b44 100644--- a/apps/web/src/features/poll/components/desktop-poll.tsx+++ b/apps/web/src/features/poll/components/desktop-poll.tsx@@ -4,7 +4,6 @@ import { cn } from "@rallly/ui";import { Badge } from "@rallly/ui/badge";import { Button } from "@rallly/ui/button";import { Card, CardHeader, CardTitle } from "@rallly/ui/card";-import { Icon } from "@rallly/ui/icon";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import {ArrowLeftIcon,@@ -110,9 +109,7 @@ function TableControls({disabled={!canScrollPrev}onClick={onGoToPreviousPage}>- <Icon>- <ArrowLeftIcon />- </Icon>+ <ArrowLeftIcon className="text-muted-foreground" /></Button>}/>@@ -133,9 +130,7 @@ function TableControls({disabled={!canScrollNext}onClick={onGoToNextPage}>- <Icon>- <ArrowRightIcon />- </Icon>+ <ArrowRightIcon className="text-muted-foreground" />{showScrollIndicator ? (<span className="absolute -top-0.5 -right-0.5 flex size-2"><span className="absolute top-0 right-0 inline-flex h-full w-full animate-ping rounded-full bg-rose-400 opacity-75" />@@ -161,9 +156,7 @@ function TableControls({size="icon"onClick={onCollapse}>- <Icon>- <ShrinkIcon />- </Icon>+ <ShrinkIcon className="text-muted-foreground" /></Button>}/>@@ -182,9 +175,7 @@ function TableControls({size="icon"onClick={onExpand}>- <Icon>- <ExpandIcon />- </Icon>+ <ExpandIcon className="text-muted-foreground" /></Button>}/>@@ -296,9 +287,7 @@ const DesktopPoll: React.FunctionComponent = () => {votingForm.newParticipant();}}>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon className="text-muted-foreground" /></Button>) : null}</div>diff --git a/apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/month-calendar.tsx b/apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/month-calendar.tsxindex 4edd37790..6a4ee0a14 100644--- a/apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/month-calendar.tsx+++ b/apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/month-calendar.tsx@@ -6,7 +6,6 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import { RadioCards, RadioCardsItem } from "@rallly/ui/radio-pills";import {CalendarIcon,@@ -530,9 +529,7 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({onChange(newOptions);}}>- <Icon>- <SparklesIcon />- </Icon>+ <SparklesIcon /><Transi18nKey="applyToAllDates"defaults="Apply to all dates"@@ -548,9 +545,7 @@ const MonthCalendar: React.FunctionComponent<DateTimePickerProps> = ({);}}>- <Icon>- <CalendarXIcon />- </Icon>+ <CalendarXIcon /><Transi18nKey="deleteDate"defaults="Delete date"diff --git a/apps/web/src/features/poll/components/mobile-poll.tsx b/apps/web/src/features/poll/components/mobile-poll.tsxindex 6419d0d1c..7afb60f6b 100644--- a/apps/web/src/features/poll/components/mobile-poll.tsx+++ b/apps/web/src/features/poll/components/mobile-poll.tsx@@ -2,7 +2,6 @@ import { cn } from "@rallly/ui";import { Badge } from "@rallly/ui/badge";import { Button } from "@rallly/ui/button";import { Card } from "@rallly/ui/card";-import { Icon } from "@rallly/ui/icon";import {Select,SelectContent,@@ -89,9 +88,7 @@ const MobilePoll: React.FunctionComponent = () => {label: (<div className="flex items-center gap-x-2.5"><div>- <Icon>- <UsersIcon />- </Icon>+ <UsersIcon className="size-4 shrink-0 text-muted-foreground" /></div><span>{t("allParticipants", {diff --git a/apps/web/src/features/poll/components/polls-infinite-list.tsx b/apps/web/src/features/poll/components/polls-infinite-list.tsxindex 46835032f..293763bcc 100644--- a/apps/web/src/features/poll/components/polls-infinite-list.tsx+++ b/apps/web/src/features/poll/components/polls-infinite-list.tsx@@ -18,7 +18,6 @@ import {DropdownMenuItem,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import { toast } from "@rallly/ui/sonner";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import { absoluteUrl, shortUrl } from "@rallly/utils/absolute-url";@@ -191,9 +190,7 @@ function PollListItem({});}}>- <Icon>- <CircleStopIcon />- </Icon>+ <CircleStopIcon /><Trans i18nKey="closePoll" defaults="Close" /></DropdownMenuItem>)}@@ -213,16 +210,12 @@ function PollListItem({});}}>- <Icon>- <PlayIcon />- </Icon>+ <PlayIcon /><Trans i18nKey="reopenPoll" defaults="Reopen poll" /></DropdownMenuItem>)}<DropdownMenuItem onClick={() => deletePollDialog.trigger()}>- <Icon>- <TrashIcon />- </Icon>+ <TrashIcon /><span><Trans i18nKey="deleteMenuItem" defaults="Delete" /></span>@@ -366,9 +359,7 @@ export function PollsInfiniteList({{!hasNextPage && data.pages.length > 1 && (<div className="flex items-center justify-center gap-2 py-4 text-muted-foreground text-sm">- <Icon>- <StickerIcon />- </Icon>+ <StickerIcon className="size-4 shrink-0 text-muted-foreground" /><Transi18nKey="endOfList"defaults="You've reached the end of the list"diff --git a/apps/web/src/features/quick-create/components/quick-create-button.tsx b/apps/web/src/features/quick-create/components/quick-create-button.tsxindex 4f099699f..1a1b4a6b9 100644--- a/apps/web/src/features/quick-create/components/quick-create-button.tsx+++ b/apps/web/src/features/quick-create/components/quick-create-button.tsx@@ -1,5 +1,4 @@import { buttonVariants } from "@rallly/ui";-import { Icon } from "@rallly/ui/icon";import { ZapIcon } from "lucide-react";import Link from "next/link";import { Trans } from "react-i18next/TransWithoutContext";@@ -13,9 +12,7 @@ export async function QuickCreateButton() {href="/quick-create"className={buttonVariants({ className: "rounded-full" })}>- <Icon>- <ZapIcon className="size-4" />- </Icon>+ <ZapIcon className="size-4 text-muted-foreground" /><Transt={t}i18n={i18n}diff --git a/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx b/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsxindex ab757937a..c11c64c2f 100644--- a/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx+++ b/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx@@ -24,7 +24,6 @@ import {DropdownMenuSubTrigger,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import { shortUrl } from "@rallly/utils/absolute-url";import { CalendarPlusIcon, MoreVerticalIcon } from "lucide-react";@@ -175,16 +174,12 @@ export function ScheduledEventListItem({/>}>- <Icon>- <MoreVerticalIcon />- </Icon>+ <MoreVerticalIcon className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuSub><DropdownMenuSubTrigger>- <Icon>- <CalendarPlusIcon />- </Icon>+ <CalendarPlusIcon /><Trans i18nKey="addToCalendar" defaults="Add to calendar" /></DropdownMenuSubTrigger><DropdownMenuSubContent>diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsxindex d11d250cc..fcd90fb0f 100644--- a/apps/web/src/features/space/components/space-dropdown.tsx+++ b/apps/web/src/features/space/components/space-dropdown.tsx@@ -13,7 +13,6 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import {ChevronsUpDownIcon,PlusIcon,@@ -76,9 +75,7 @@ export function SpaceDropdown({<SpaceTierLabel tier={displayedSpace.tier} /></div></div>- <Icon>- <ChevronsUpDownIcon />- </Icon>+ <ChevronsUpDownIcon className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContentclassName="min-w-[var(--anchor-width)]"@@ -107,22 +104,16 @@ export function SpaceDropdown({))}</DropdownMenuRadioGroup><DropdownMenuItem onClick={newSpaceDialog.trigger}>- <Icon>- <PlusIcon />- </Icon>+ <PlusIcon /><Trans i18nKey="createSpace" defaults="Create space" /></DropdownMenuItem><DropdownMenuSeparator /><DropdownMenuItem render={<Link href="/settings/general" />}>- <Icon>- <SettingsIcon />- </Icon>+ <SettingsIcon /><Trans i18nKey="spaceSettings" defaults="Space settings" /></DropdownMenuItem><DropdownMenuItem render={<Link href="/members" />}>- <Icon>- <UserPlusIcon />- </Icon>+ <UserPlusIcon /><Trans i18nKey="spaceInviteMember" defaults="Invite member" /></DropdownMenuItem></DropdownMenuContent>diff --git a/apps/web/src/features/user/components/nav-user.tsx b/apps/web/src/features/user/components/nav-user.tsxindex c652aff38..fc5ce7b91 100644--- a/apps/web/src/features/user/components/nav-user.tsx+++ b/apps/web/src/features/user/components/nav-user.tsx@@ -14,7 +14,6 @@ import {DropdownMenuSubTrigger,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import {ChevronDownIcon,LogOutIcon,@@ -61,9 +60,7 @@ export function NavUser() {{user.email}</div></div>- <Icon>- <ChevronDownIcon />- </Icon>+ <ChevronDownIcon className="text-muted-foreground" /></DropdownMenuTrigger><DropdownMenuContentclassName="w-(--anchor-width)"@@ -74,43 +71,31 @@ export function NavUser() {<Trans i18nKey="account" defaults="Account" /></DropdownMenuLabel><DropdownMenuItem render={<Link href="/settings/profile" />}>- <Icon>- <UserIcon />- </Icon>+ <UserIcon /><Trans i18nKey="profile" defaults="Profile" /></DropdownMenuItem><DropdownMenuItem render={<Link href="/settings/preferences" />}>- <Icon>- <Settings2Icon />- </Icon>+ <Settings2Icon /><Trans i18nKey="preferences" defaults="Preferences" /></DropdownMenuItem><DropdownMenuSeparator /><DropdownMenuSub><DropdownMenuSubTrigger>- <Icon>- <SunMoonIcon />- </Icon>+ <SunMoonIcon /><Trans i18nKey="theme" defaults="Theme" /></DropdownMenuSubTrigger><DropdownMenuSubContent><DropdownMenuRadioGroup value={theme} onValueChange={setTheme}><DropdownMenuRadioItem value="system">- <Icon>- <MonitorIcon />- </Icon>+ <MonitorIcon /><Trans i18nKey="themeSystem" defaults="System" /></DropdownMenuRadioItem><DropdownMenuRadioItem value="light">- <Icon>- <SunIcon />- </Icon>+ <SunIcon /><Trans i18nKey="themeLight" defaults="Light" /></DropdownMenuRadioItem><DropdownMenuRadioItem value="dark">- <Icon>- <MoonIcon />- </Icon>+ <MoonIcon /><Trans i18nKey="themeDark" defaults="Dark" /></DropdownMenuRadioItem></DropdownMenuRadioGroup>@@ -128,9 +113,7 @@ export function NavUser() {}}}>- <Icon>- <LogOutIcon />- </Icon>+ <LogOutIcon /><Trans i18nKey="signOut" defaults="Sign out" /></DropdownMenuItem></DropdownMenuContent>diff --git a/apps/web/src/features/user/components/user-dropdown.tsx b/apps/web/src/features/user/components/user-dropdown.tsxindex 92bd1b2bd..9800ee528 100644--- a/apps/web/src/features/user/components/user-dropdown.tsx+++ b/apps/web/src/features/user/components/user-dropdown.tsx@@ -14,7 +14,6 @@ import {DropdownMenuSubTrigger,DropdownMenuTrigger,} from "@rallly/ui/dropdown-menu";-import { Icon } from "@rallly/ui/icon";import {ArrowUpRight,LifeBuoyIcon,@@ -128,36 +127,26 @@ export const UserDropdown = ({ className }: { className?: string }) => {><LifeBuoyIcon className="size-4 text-muted-foreground" /><Trans i18nKey="support" defaults="Support" />- <Icon>- <ArrowUpRight />- </Icon>+ <ArrowUpRight /></DropdownMenuItem><DropdownMenuSeparator /><DropdownMenuSub><DropdownMenuSubTrigger>- <Icon>- <SunMoonIcon />- </Icon>+ <SunMoonIcon /><Trans i18nKey="theme" defaults="Theme" /></DropdownMenuSubTrigger><DropdownMenuSubContent><DropdownMenuRadioGroup value={theme} onValueChange={setTheme}><DropdownMenuRadioItem value="system">- <Icon>- <MonitorIcon />- </Icon>+ <MonitorIcon /><Trans i18nKey="themeSystem" defaults="System" /></DropdownMenuRadioItem><DropdownMenuRadioItem value="light">- <Icon>- <SunIcon />- </Icon>+ <SunIcon /><Trans i18nKey="themeLight" defaults="Light" /></DropdownMenuRadioItem><DropdownMenuRadioItem value="dark">- <Icon>- <MoonIcon />- </Icon>+ <MoonIcon /><Trans i18nKey="themeDark" defaults="Dark" /></DropdownMenuRadioItem></DropdownMenuRadioGroup>diff --git a/packages/ui/src/command.tsx b/packages/ui/src/command.tsxindex 3c1e18432..cda477407 100644--- a/packages/ui/src/command.tsx+++ b/packages/ui/src/command.tsx@@ -12,7 +12,6 @@ import {DialogTitle,} from "./dialog";import { usePlatform } from "./hooks/use-platform";-import { Icon } from "./icon";import { cn } from "./lib/utils";const Command = React.forwardRef<@@ -70,9 +69,7 @@ const CommandInput = React.forwardRef<className="flex items-center gap-x-2.5 border-b px-3"cmdk-input-wrapper="">- <Icon>- <SearchIcon className="shrink-0" />- </Icon>+ <SearchIcon className="size-4 shrink-0 text-muted-foreground" /><CommandPrimitive.Inputref={ref}className={cn(diff --git a/packages/ui/src/dropdown-menu.tsx b/packages/ui/src/dropdown-menu.tsxindex 70fae8ae9..ac040e708 100644--- a/packages/ui/src/dropdown-menu.tsx+++ b/packages/ui/src/dropdown-menu.tsx@@ -6,7 +6,6 @@ import { cva } from "class-variance-authority";import { CheckIcon, ChevronRightIcon } from "lucide-react";import type * as React from "react";-import { Icon } from "./icon";import { cn } from "./lib/utils";function DropdownMenu({ ...props }: MenuPrimitive.Root.Props) {@@ -111,9 +110,7 @@ function DropdownMenuRadioItem({><span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center"><MenuPrimitive.RadioItemIndicator>- <Icon>- <CheckIcon />- </Icon>+ <CheckIcon /></MenuPrimitive.RadioItemIndicator></span>{children}diff --git a/packages/ui/src/icon.tsx b/packages/ui/src/icon.tsxdeleted file mode 100644index 23ec0c358..000000000--- a/packages/ui/src/icon.tsx+++ /dev/null@@ -1,57 +0,0 @@-"use client";-import { useRender } from "@base-ui/react/use-render";-import type { VariantProps } from "class-variance-authority";-import { cva } from "class-variance-authority";-import * as React from "react";--import { cn } from "./lib/utils";--const iconVariants = cva("", {- variants: {- variant: {- default: "text-muted-foreground",- success: "text-green-600 dark:text-green-500",- danger: "text-destructive",- primary: "text-primary",- },- size: {- sm: "h-3 w-3",- md: "h-4 w-4",- lg: "h-5 w-5",- xl: "h-7 w-7",- },- },- defaultVariants: {- size: "md",- variant: "default",- },-});--export interface IconProps extends VariantProps<typeof iconVariants> {- children?: React.ReactNode;-}--export function Icon({- children,- className,- size,- variant,-}: { className?: string } & IconProps) {- const element = useRender({- defaultTagName: "span",- render: React.isValidElement<{ className?: string }>(children)- ? children- : undefined,- props: {- className: cn(- iconVariants({ size, variant }),- "group shrink-0 group-[.bg-destructive]:text-destructive-foreground",- className,- ),- },- });- if (!React.isValidElement(children)) {- return null;- }- return element;-}diff --git a/packages/ui/src/select.tsx b/packages/ui/src/select.tsxindex 81f7c156d..8931982ff 100644--- a/packages/ui/src/select.tsx+++ b/packages/ui/src/select.tsx@@ -4,7 +4,6 @@ import { Select as SelectPrimitive } from "@base-ui/react/select";import { CheckIcon, ChevronsUpDownIcon } from "lucide-react";import { buttonVariants } from "./button-variants";-import { Icon } from "./icon";import { cn } from "./lib/utils";function Select<Value, Multiple extends boolean | undefined = false>(@@ -107,9 +106,7 @@ function SelectItem({><span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center"><SelectPrimitive.ItemIndicator>- <Icon>- <CheckIcon className="size-4" />- </Icon>+ <CheckIcon className="size-4 shrink-0 text-muted-foreground" /></SelectPrimitive.ItemIndicator></span><SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>diff --git a/packages/ui/src/sidebar.tsx b/packages/ui/src/sidebar.tsxindex b7e64fb92..6f3060f33 100644--- a/packages/ui/src/sidebar.tsx+++ b/packages/ui/src/sidebar.tsx@@ -9,7 +9,6 @@ import * as React from "react";import { Button } from "./button";import { useIsMobile } from "./hooks/use-mobile";-import { Icon } from "./icon";import { Input } from "./input";import { cn } from "./lib/utils";import { Separator } from "./separator";@@ -275,9 +274,7 @@ const SidebarTrigger = React.forwardRef<}}{...props}>- <Icon>- <PanelLeft />- </Icon>+ <PanelLeft className="text-muted-foreground" /><span className="sr-only">Toggle Sidebar</span></Button>);