@carlonicora/nextjs-jsonapi 1.131.1 → 1.132.0

package/src/components/navigations/Breadcrumb.tsx

@@ -19,18 +19,18 @@ import {
   Breadcrumb as UIBreadcrumb,
 } from "../../shadcnui";
 
-type BreadcrumbProps = { items: BreadcrumbItemData[] };
+type BreadcrumbProps = { items: BreadcrumbItemData[]; rootLabel?: string };
 
 const ITEMS_TO_DISPLAY = 4;
 
 function BreadcrumbDesktop({
   items,
   generateUrl,
-  t,
+  rootLabel,
 }: {
   items: BreadcrumbItemData[];
   generateUrl: ReturnType<typeof usePageUrlGenerator>;
-  t: ReturnType<typeof useTranslations>;
+  rootLabel: string;
 }) {
   const [open, setOpen] = useState<boolean>(false);
 
@@ -38,7 +38,7 @@ function BreadcrumbDesktop({
     <UIBreadcrumb>
       <BreadcrumbList>
         <BreadcrumbItem>
-          <Link href={generateUrl({ page: `/` })}>{t(`common.home`)}</Link>
+          <Link href={generateUrl({ page: `/` })}>{rootLabel}</Link>
         </BreadcrumbItem>
         {items.length > 0 && <BreadcrumbSeparator />}
 
@@ -112,23 +112,23 @@ function BreadcrumbDesktop({
 function BreadcrumbMobile({
   items,
   generateUrl,
-  t,
+  rootLabel,
 }: {
   items: BreadcrumbItemData[];
   generateUrl: ReturnType<typeof usePageUrlGenerator>;
-  t: ReturnType<typeof useTranslations>;
+  rootLabel: string;
 }) {
   const [open, setOpen] = useState<boolean>(false);
 
   const lastItem = items[items.length - 1];
-  const allItems = [{ name: t(`common.home`), href: generateUrl({ page: `/` }) }, ...items];
+  const allItems = [{ name: rootLabel, href: generateUrl({ page: `/` }) }, ...items];
 
   if (!lastItem && items.length === 0) {
     return (
       <UIBreadcrumb>
         <BreadcrumbList>
           <BreadcrumbItem>
-            <Link href={generateUrl({ page: `/` })}>{t(`common.home`)}</Link>
+            <Link href={generateUrl({ page: `/` })}>{rootLabel}</Link>
           </BreadcrumbItem>
         </BreadcrumbList>
       </UIBreadcrumb>
@@ -158,14 +158,16 @@ function BreadcrumbMobile({
   );
 }
 
-export function BreadcrumbNavigation({ items }: BreadcrumbProps) {
+export function BreadcrumbNavigation({ items, rootLabel }: BreadcrumbProps) {
   const generateUrl = usePageUrlGenerator();
   const t = useTranslations();
   const isMobile = useIsMobile();
 
+  const root = rootLabel?.trim() ? rootLabel : t(`common.home`);
+
   if (isMobile) {
-    return <BreadcrumbMobile items={items} generateUrl={generateUrl} t={t} />;
+    return <BreadcrumbMobile items={items} generateUrl={generateUrl} rootLabel={root} />;
   }
 
-  return <BreadcrumbDesktop items={items} generateUrl={generateUrl} t={t} />;
+  return <BreadcrumbDesktop items={items} generateUrl={generateUrl} rootLabel={root} />;
 }

package/src/components/navigations/Header.tsx

@@ -1,6 +1,7 @@
 "use client";
 
 import { useIsMobile } from "@/utils";
+import { useHeaderRootLabel } from "../../contexts/HeaderChildrenContext";
 import { useSharedContext } from "../../contexts/SharedContext";
 import { SidebarTrigger } from "../../shadcnui";
 import { BreadcrumbNavigation } from "./Breadcrumb";
@@ -13,6 +14,7 @@ type HeaderProps = {
 
 export function Header({ children, leftContent, className }: HeaderProps) {
   const { breadcrumbs } = useSharedContext();
+  const rootLabel = useHeaderRootLabel();
   const isMobile = useIsMobile();
 
   return (
@@ -21,7 +23,7 @@ export function Header({ children, leftContent, className }: HeaderProps) {
         <SidebarTrigger aria-label="Toggle sidebar" id="sidebar-trigger" />
         {leftContent}
         <div className="flex w-full flex-row items-center justify-start">
-          <BreadcrumbNavigation items={breadcrumbs} />
+          <BreadcrumbNavigation items={breadcrumbs} rootLabel={rootLabel ?? undefined} />
         </div>
         {!isMobile && children && (
           <div className="flex w-64 flex-row items-center justify-end gap-x-4 whitespace-nowrap">

package/src/contexts/HeaderChildrenContext.tsx

@@ -4,24 +4,30 @@ import { createContext, useContext, ReactNode } from "react";
 
 interface HeaderChildrenContextType {
   headerChildren: ReactNode | null;
+  headerRootLabel: string | null;
 }
 
 const HeaderChildrenContext = createContext<HeaderChildrenContextType>({
   headerChildren: null,
+  headerRootLabel: null,
 });
 
 interface HeaderChildrenProviderProps {
   children: ReactNode;
   content: ReactNode;
+  rootLabel?: string;
 }
 
 /**
  * Provider to supply custom content to be rendered in the Header component.
  * Wrap your layout with this provider and pass the content you want in the header.
+ * Optionally pass `rootLabel` to override the first breadcrumb entry (defaults to `common.home`).
  */
-export function HeaderChildrenProvider({ children, content }: HeaderChildrenProviderProps) {
+export function HeaderChildrenProvider({ children, content, rootLabel }: HeaderChildrenProviderProps) {
   return (
-    <HeaderChildrenContext.Provider value={{ headerChildren: content }}>{children}</HeaderChildrenContext.Provider>
+    <HeaderChildrenContext.Provider value={{ headerChildren: content, headerRootLabel: rootLabel ?? null }}>
+      {children}
+    </HeaderChildrenContext.Provider>
   );
 }
 
@@ -33,3 +39,12 @@ export function useHeaderChildren(): ReactNode | null {
   const context = useContext(HeaderChildrenContext);
   return context.headerChildren;
 }
+
+/**
+ * Hook to get the label of the first breadcrumb entry, when the application supplies one.
+ * Returns null when no override was provided, in which case the Header falls back to `common.home`.
+ */
+export function useHeaderRootLabel(): string | null {
+  const context = useContext(HeaderChildrenContext);
+  return context.headerRootLabel;
+}

package/src/features/assistant-message/components/MessageItem.tsx

@@ -46,7 +46,7 @@ export function MessageItem({
           <div className="text-destructive flex items-center gap-2 text-xs">
             <AlertCircle className="h-3.5 w-3.5" />
             <span>{t("features.assistant.send_failed")}</span>
-            <button type="button" className="underline" onClick={() => onRetry?.(message.id)}>
+            <button type="button" onClick={() => onRetry?.(message.id)}>
               {t("features.assistant.retry")}
             </button>
           </div>

package/src/features/auth/components/GdprConsentSection.tsx

@@ -21,11 +21,11 @@ export function GdprConsentSection<T extends FieldValues>({
   const termsLabel = (
     <>
       {t("terms_prefix")}{" "}
-      <Link href="/terms" target="_blank" rel="noopener" className="underline">
+      <Link href="/terms" target="_blank" rel="noopener">
         {t("terms_of_service")}
       </Link>{" "}
       {t("and")}{" "}
-      <Link href="/privacy" target="_blank" rel="noopener" className="underline">
+      <Link href="/privacy" target="_blank" rel="noopener">
         {t("privacy_policy")}
       </Link>
     </>

package/src/features/auth/components/forms/Register.tsx

@@ -194,7 +194,7 @@ export default function Register() {
         <CardContent className="text-center">
           <p className="text-destructive mb-4">{inviteError}</p>
           <p className="mb-4">{t("waitlist.invite.join_prompt")}</p>
-          <Link href="/waitlist" className="text-primary underline">
+          <Link href="/waitlist" className="text-primary">
             {t("waitlist.invite.join_link")}
           </Link>
         </CardContent>
@@ -215,7 +215,7 @@ export default function Register() {
         <CardContent className="text-center">
           <p className="mb-4">{t("waitlist.invite.registration_description")}</p>
           <p className="mb-4">{t("waitlist.invite.registration_hint")}</p>
-          <Link href="/waitlist" className="text-primary underline">
+          <Link href="/waitlist" className="text-primary">
             {t("waitlist.invite.join_link")}
           </Link>
         </CardContent>

package/src/features/help/components/HelpArticleBody.tsx

@@ -43,14 +43,14 @@ export function HelpArticleBody(props: {
       ) : null}
       <div className="mt-4 flex justify-between text-sm">
         {prev ? (
-          <Link href={generateUrl({ page: `/help/${prev.howToType}/${prev.slug}` })} className="hover:underline">
+          <Link href={generateUrl({ page: `/help/${prev.howToType}/${prev.slug}` })}>
             ← {t("help.article.previous")}: {prev.title}
           </Link>
         ) : (
           <span />
         )}
         {next ? (
-          <Link href={generateUrl({ page: `/help/${next.howToType}/${next.slug}` })} className="hover:underline">
+          <Link href={generateUrl({ page: `/help/${next.howToType}/${next.slug}` })}>
             {t("help.article.next")}: {next.title} →
           </Link>
         ) : (

package/src/features/notification/components/common/NotificationErrorBoundary.tsx

@@ -34,10 +34,7 @@ export class NotificationErrorBoundary extends Component<Props, State> {
           <div className="flex items-center justify-center p-4 text-center">
             <div className="text-muted-foreground text-sm">
               <p>Something went wrong with notifications.</p>
-              <button
-                onClick={() => this.setState({ hasError: false })}
-                className="text-primary mt-2 underline hover:no-underline"
-              >
+              <button onClick={() => this.setState({ hasError: false })} className="text-primary mt-2">
                 Try again
               </button>
             </div>

package/src/features/notification/contexts/__tests__/NotificationContext.spec.tsx

@@ -2,12 +2,12 @@ import { describe, it, expect, vi, beforeAll, beforeEach } from "vitest";
 import { renderHook, act } from "@testing-library/react";
 import { configureI18n } from "../../../../i18n";
 
-// currentUser undefined → the provider's initial-load effect is a no-op
-// (it returns early on `!currentUser`), so the ONLY fetches in this test come
-// from the explicit loadNotifications() calls below. This isolates the
-// in-flight de-duplication behaviour from the mount-time auto-load.
+// The provider's initial-load effect returns early on `!currentUser`. Tests set
+// `userMock.currentUser` to choose whether the mount-time auto-load fires.
+const userMock = vi.hoisted(() => ({ currentUser: undefined as any }));
+
 vi.mock("../../../user/contexts/CurrentUserContext", () => ({
-  useCurrentUserContext: () => ({ currentUser: undefined }),
+  useCurrentUserContext: () => userMock,
 }));
 vi.mock("../../data/notification.service", () => ({
   NotificationService: { findMany: vi.fn(), markAsRead: vi.fn() },
@@ -41,6 +41,7 @@ describe("NotificationContext.loadNotifications", () => {
   });
 
   beforeEach(() => {
+    userMock.currentUser = undefined;
     vi.mocked(NotificationService.findMany).mockReset();
   });
 
@@ -55,9 +56,9 @@ describe("NotificationContext.loadNotifications", () => {
 
     const { result } = renderHook(() => useNotificationContext(), { wrapper });
 
-    // Three concurrent callers, mirroring the three mount-time triggers
-    // (provider + LayoutDetails + NotificationModal) firing before the first
-    // request resolves.
+    // Three concurrent callers, mirroring the mount-time triggers (provider +
+    // NotificationModal) plus any consumer that loads on mount, all firing
+    // before the first request resolves.
     await act(async () => {
       result.current.loadNotifications();
       result.current.loadNotifications();
@@ -68,3 +69,28 @@ describe("NotificationContext.loadNotifications", () => {
     expect(NotificationService.findMany).toHaveBeenCalledTimes(1);
   });
 });
+
+describe("NotificationContextProvider mount load", () => {
+  beforeEach(() => {
+    vi.mocked(NotificationService.findMany).mockReset();
+    vi.mocked(NotificationService.findMany).mockResolvedValue([] as never);
+  });
+
+  it("loads notifications exactly once on mount when a user is present", async () => {
+    userMock.currentUser = { id: "user-1", roles: [] };
+
+    const { rerender } = renderHook(() => useNotificationContext(), { wrapper });
+
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
+    rerender();
+
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+
+    expect(NotificationService.findMany).toHaveBeenCalledTimes(1);
+  });
+});

package/src/features/oauth/components/consent/OAuthConsentScreen.tsx

@@ -111,11 +111,11 @@ export function OAuthConsentScreen({
         <CardFooter className="justify-center">
           <p className="text-xs text-center text-muted-foreground">
             By authorizing, you agree to the app's{" "}
-            <a href={termsUrl} className="underline hover:text-foreground" target="_blank" rel="noopener">
+            <a href={termsUrl} className="hover:text-foreground" target="_blank" rel="noopener">
               Terms of Service
             </a>{" "}
             and{" "}
-            <a href={privacyUrl} className="underline hover:text-foreground" target="_blank" rel="noopener">
+            <a href={privacyUrl} className="hover:text-foreground" target="_blank" rel="noopener">
               Privacy Policy
             </a>
             .

package/src/features/user/contexts/CurrentUserContext.tsx

@@ -3,7 +3,7 @@
 import { useAtom } from "jotai";
 import { atomWithStorage } from "jotai/utils";
 import { usePathname } from "next/navigation";
-import React, { createContext, useCallback, useContext, useEffect, useRef, useState } from "react";
+import React, { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useSocketContext } from "../../../contexts/SocketContext";
 import { Modules, rehydrate } from "../../../core";
 import { Action, checkPermissions, ModuleWithPermissions } from "../../../permissions";
@@ -66,13 +66,31 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
     return descriptor?.get?.call(Modules);
   };
 
-  const currentUser = dehydratedUser ? rehydrate<UserInterface>(Modules.User, dehydratedUser) : null;
+  const currentUser = useMemo(
+    () => (dehydratedUser ? rehydrate<UserInterface>(Modules.User, dehydratedUser) : null),
+    [dehydratedUser],
+  );
 
-  const company = currentUser?.company ?? null;
+  // Balances pushed by company:tokens_updated. Transient: a real user refresh is
+  // authoritative and clears this.
+  const [tokenOverride, setTokenOverride] = useState<{
+    availableMonthlyTokens: number;
+    availableExtraTokens: number;
+  } | null>(null);
+
+  const company = useMemo<CompanyInterface | null>(() => {
+    const c = currentUser?.company ?? null;
+    if (!c || !tokenOverride) return c;
+    return Object.assign(Object.create(Object.getPrototypeOf(c)), c, {
+      _availableMonthlyTokens: tokenOverride.availableMonthlyTokens,
+      _availableExtraTokens: tokenOverride.availableExtraTokens,
+    });
+  }, [currentUser, tokenOverride]);
 
   const setUser = (user?: UserInterface): void => {
     if (user) setDehydratedUser(user.dehydrate() as any);
     else setDehydratedUser(null);
+    setTokenOverride(null);
   };
 
   const hasRole = (roleId: string): boolean => {
@@ -159,6 +177,7 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
           }
 
           setDehydratedUser(fullUser.dehydrate() as any);
+          setTokenOverride(null);
         }
       } catch (error) {
         console.error("Failed to refresh user data:", error);
@@ -185,7 +204,23 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
       return;
     }
 
-    const handleCompanyUpdate = (data: { companyId: string; type: string }) => {
+    // Hot path: fires once per LLM call. Fully described by its payload — must
+    // never trigger an HTTP request.
+    const handleTokensUpdated = (data: {
+      companyId: string;
+      availableMonthlyTokens: number;
+      availableExtraTokens: number;
+    }) => {
+      if (data.companyId !== currentUser.company?.id) return;
+      setTokenOverride({
+        availableMonthlyTokens: data.availableMonthlyTokens,
+        availableExtraTokens: data.availableExtraTokens,
+      });
+    };
+
+    // Rare (Stripe webhooks only) and genuinely changes features, modules and
+    // permissions — a payload cannot economically carry that, so refetch.
+    const handleSubscriptionUpdated = (data: { companyId: string; type: string }) => {
       if (data.companyId === currentUser.company?.id && !isRefreshingRef.current) {
         isRefreshingRef.current = true;
         // Skip cookie update to prevent page reload - only update React state
@@ -195,13 +230,12 @@ export const CurrentUserProvider = ({ children }: { children: React.ReactNode })
       }
     };
 
-    // Both events trigger the same refresh behavior
-    socket.on("company:tokens_updated", handleCompanyUpdate);
-    socket.on("company:subscription_updated", handleCompanyUpdate);
+    socket.on("company:tokens_updated", handleTokensUpdated);
+    socket.on("company:subscription_updated", handleSubscriptionUpdated);
 
     return () => {
-      socket.off("company:tokens_updated", handleCompanyUpdate);
-      socket.off("company:subscription_updated", handleCompanyUpdate);
+      socket.off("company:tokens_updated", handleTokensUpdated);
+      socket.off("company:subscription_updated", handleSubscriptionUpdated);
     };
   }, [socket, isConnected, currentUser?.company?.id]);
 

package/src/features/user/contexts/__tests__/CurrentUserContext.spec.tsx

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render } from "@testing-library/react";
+import { render, act } from "@testing-library/react";
 
 vi.mock("cookies-next", () => ({
   getCookie: vi.fn(() => undefined),
@@ -9,14 +9,54 @@ vi.mock("next/navigation", () => ({
   usePathname: () => "/",
 }));
 
+const socketMock = vi.hoisted(() => {
+  const handlers: Record<string, ((data: any) => void)[]> = {};
+  return {
+    socket: {
+      on: (event: string, handler: (data: any) => void) => {
+        (handlers[event] ??= []).push(handler);
+      },
+      off: (event: string, handler: (data: any) => void) => {
+        handlers[event] = (handlers[event] ?? []).filter((h) => h !== handler);
+      },
+    },
+    emit: (event: string, data: any) => {
+      (handlers[event] ?? []).forEach((h) => h(data));
+    },
+    reset: () => {
+      for (const key of Object.keys(handlers)) delete handlers[key];
+    },
+  };
+});
+
 vi.mock("../../../../contexts/SocketContext", () => ({
-  useSocketContext: () => ({ socket: null, isConnected: false }),
+  useSocketContext: () => ({ socket: socketMock.socket, isConnected: true }),
 }));
 
-vi.mock("../../../../core", () => ({
-  Modules: { User: { name: "users" } },
-  rehydrate: (_module: unknown, data: any) => data,
-}));
+vi.mock("../../../../core", () => {
+  // Mirrors the real Company model: public getters over private backing fields.
+  // The token overlay writes the backing fields, so a plain object would not
+  // exercise it.
+  class FakeCompany {
+    id = "";
+    monthlyTokens = 0;
+    _availableMonthlyTokens = 0;
+    _availableExtraTokens = 0;
+    get availableMonthlyTokens() {
+      return this._availableMonthlyTokens ?? 0;
+    }
+    get availableExtraTokens() {
+      return this._availableExtraTokens ?? 0;
+    }
+  }
+  return {
+    Modules: { User: { name: "users" } },
+    rehydrate: (_module: unknown, data: any) => ({
+      ...data,
+      company: data.company ? Object.assign(new FakeCompany(), data.company) : null,
+    }),
+  };
+});
 
 vi.mock("../../../../permissions", () => ({
   Action: { Read: "read", Write: "write", Create: "create", Update: "update", Delete: "delete" },
@@ -139,3 +179,106 @@ describe("CurrentUserProvider", () => {
     expect(getByTestId("current-user-id").textContent).toBe("new");
   });
 });
+
+describe("CurrentUserProvider token updates", () => {
+  const STORED_USER = {
+    id: "user-1",
+    roles: [],
+    modules: [],
+    company: {
+      id: "company-1",
+      monthlyTokens: 1000,
+      _availableMonthlyTokens: 900,
+      _availableExtraTokens: 50,
+    },
+  };
+
+  function CompanyConsumer() {
+    const { company } = useCurrentUserContext();
+    return (
+      <div data-testid="balances">
+        {company ? `${(company as any).availableMonthlyTokens}/${(company as any).availableExtraTokens}` : "null"}
+      </div>
+    );
+  }
+
+  beforeEach(() => {
+    localStorage.clear();
+    socketMock.reset();
+    vi.clearAllMocks();
+  });
+
+  it("patches balances from company:tokens_updated without refetching the user", async () => {
+    localStorage.setItem("user", JSON.stringify(STORED_USER));
+
+    const { getByTestId } = render(
+      <CurrentUserProvider>
+        <CompanyConsumer />
+      </CurrentUserProvider>,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    expect(getByTestId("balances").textContent).toBe("900/50");
+
+    await act(async () => {
+      socketMock.emit("company:tokens_updated", {
+        type: "company:tokens_updated",
+        companyId: "company-1",
+        availableMonthlyTokens: 750,
+        availableExtraTokens: 40,
+      });
+    });
+
+    expect(getByTestId("balances").textContent).toBe("750/40");
+    expect(UserService.findFullUser).not.toHaveBeenCalled();
+  });
+
+  it("ignores company:tokens_updated for a different company", async () => {
+    localStorage.setItem("user", JSON.stringify(STORED_USER));
+
+    const { getByTestId } = render(
+      <CurrentUserProvider>
+        <CompanyConsumer />
+      </CurrentUserProvider>,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    await act(async () => {
+      socketMock.emit("company:tokens_updated", {
+        type: "company:tokens_updated",
+        companyId: "someone-else",
+        availableMonthlyTokens: 1,
+        availableExtraTokens: 1,
+      });
+    });
+
+    expect(getByTestId("balances").textContent).toBe("900/50");
+  });
+
+  it("still refetches the full user on company:subscription_updated", async () => {
+    localStorage.setItem("user", JSON.stringify(STORED_USER));
+    vi.mocked(UserService.findFullUser).mockResolvedValue({
+      ...STORED_USER,
+      dehydrate: () => STORED_USER,
+    } as any);
+
+    render(
+      <CurrentUserProvider>
+        <CompanyConsumer />
+      </CurrentUserProvider>,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    await act(async () => {
+      socketMock.emit("company:subscription_updated", {
+        type: "company:subscription_updated",
+        companyId: "company-1",
+      });
+      await new Promise((resolve) => setTimeout(resolve, 50));
+    });
+
+    expect(UserService.findFullUser).toHaveBeenCalledTimes(1);
+  });
+});

package/src/features/waitlist/components/forms/WaitlistForm.tsx

@@ -159,11 +159,11 @@ export function WaitlistForm({ onSuccess }: WaitlistFormProps) {
             label={
               <>
                 {t("auth.gdpr.terms_prefix")}
-                <Link href="/terms" target="_blank" rel="noopener" className="underline">
+                <Link href="/terms" target="_blank" rel="noopener">
                   {t("auth.gdpr.terms_of_service")}
                 </Link>
                 {t("auth.gdpr.and")}
-                <Link href="/privacy" target="_blank" rel="noopener" className="underline">
+                <Link href="/privacy" target="_blank" rel="noopener">
                   {t("auth.gdpr.privacy_policy")}
                 </Link>
               </>

package/src/features/waitlist/components/lists/WaitlistList.tsx

@@ -3,7 +3,7 @@
 import { flexRender, getCoreRowModel, useReactTable } from "@tanstack/react-table";
 import { RefreshCw, Users } from "lucide-react";
 import { useTranslations } from "next-intl";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { errorToast } from "../../../../components";
 import { SectionHeader } from "../../../../components/typography";
 import {
@@ -64,6 +64,17 @@ export function WaitlistList() {
 
   const columns = useWaitlistTableStructure({ onInvite: handleInvite });
 
+  const statusItems = useMemo(
+    () => ({
+      all: t("waitlist.admin.all_statuses"),
+      pending: t("waitlist.admin.status.pending"),
+      confirmed: t("waitlist.admin.status.confirmed"),
+      invited: t("waitlist.admin.status.invited"),
+      registered: t("waitlist.admin.status.registered"),
+    }),
+    [t],
+  );
+
   const table = useReactTable({
     data: entries,
     columns,
@@ -82,7 +93,7 @@ export function WaitlistList() {
 
         <div className="flex items-center gap-4">
           {/* Status Filter */}
-          <Select value={statusFilter} onValueChange={(value) => setStatusFilter(value ?? "all")}>
+          <Select items={statusItems} value={statusFilter} onValueChange={(value) => setStatusFilter(value ?? "all")}>
             <SelectTrigger className="w-40">
               <SelectValue placeholder={t("waitlist.admin.filter_placeholder")} />
             </SelectTrigger>

package/src/shadcnui/custom/link.tsx

@@ -21,7 +21,7 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkProps>(({ className, href,
       prefetch={false}
       ref={ref}
       href={href}
-      className={cn("text-primary font-medium hover:underline", className)}
+      className={cn("text-primary font-medium", className)}
       {...props}
     >
       {children}

package/src/shadcnui/ui/accordion.tsx

@@ -59,7 +59,7 @@ function AccordionContent({ className, children, ...props }: AccordionPrimitive.
     >
       <div
         className={cn(
-          "pt-0 pb-4 [&_a]:hover:text-foreground h-(--accordion-panel-height) data-ending-style:h-0 data-starting-style:h-0 [&_a]:underline [&_a]:underline-offset-3 [&_p:not(:last-child)]:mb-4",
+          "pt-0 pb-4 [&_a]:hover:text-foreground h-(--accordion-panel-height) data-ending-style:h-0 data-starting-style:h-0 [&_p:not(:last-child)]:mb-4",
           className,
         )}
       >

package/src/shadcnui/ui/alert-dialog.tsx

@@ -114,7 +114,7 @@ function AlertDialogDescription({
     <AlertDialogPrimitive.Description
       data-slot="alert-dialog-description"
       className={cn(
-        "text-muted-foreground *:[a]:hover:text-foreground text-xs/relaxed text-balance md:text-pretty *:[a]:underline *:[a]:underline-offset-3",
+        "text-muted-foreground *:[a]:hover:text-foreground text-xs/relaxed text-balance md:text-pretty",
         className,
       )}
       {...props}