dubinc · steven-tey · Aug 21, 2025 · Jul 25, 2025 · Aug 21, 2025 · Aug 21, 2025
diff --git a/apps/web/app/app.dub.co/(dashboard)/account/settings/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/account/settings/page-client.tsx
@@ -6,19 +6,20 @@ import UpdateSubscription from "@/ui/account/update-subscription";
 import UploadAvatar from "@/ui/account/upload-avatar";
 import UserId from "@/ui/account/user-id";
 import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
-import { Form } from "@dub/ui";
+import { Form, useCurrentSubdomain } from "@dub/ui";
 import { APP_NAME } from "@dub/utils";
 import { useSession } from "next-auth/react";
 import { toast } from "sonner";
 
 export function SettingsPageClient() {
   const { data: session, update, status } = useSession();
+  const { subdomain } = useCurrentSubdomain();
 
   return (
     <PageWidthWrapper className="mb-8 grid gap-8">
       <Form
         title="Your Name"
-        description={`This will be your display name on ${APP_NAME}.`}
+        description={`This is the display name on your  ${APP_NAME} account.`}
         inputAttrs={{
           name: "name",
           defaultValue:
@@ -76,7 +77,7 @@ export function SettingsPageClient() {
       />
       <UploadAvatar />
       <UserId />
-      <UpdateDefaultWorkspace />
+      {subdomain === "app" && <UpdateDefaultWorkspace />}
       <DeleteAccountSection />
     </PageWidthWrapper>
   );

diff --git a/apps/web/lib/swr/use-links-count.ts b/apps/web/lib/swr/use-links-count.ts
@@ -1,6 +1,5 @@
-import { useRouterStuff } from "@dub/ui";
+import { useCurrentSubdomain, useRouterStuff } from "@dub/ui";
 import { fetcher } from "@dub/utils";
-import { useEffect, useState } from "react";
 import useSWR from "swr";
 import z from "../zod";
 import { getLinksCountQuerySchema } from "../zod/schemas/links";
@@ -20,14 +19,8 @@ export default function useLinksCount<T = any>({
 } = {}) {
   const { id: workspaceId } = useWorkspace();
   const { getQueryString } = useRouterStuff();
-
-  const [admin, setAdmin] = useState(false);
-  useEffect(() => {
-    if (window.location.host.startsWith("admin.")) {
-      setAdmin(true);
-    }
-  }, []);
   const { isMegaFolder } = useIsMegaFolder();
+  const { subdomain } = useCurrentSubdomain();
 
   const { data, error } = useSWR<any>(
     workspaceId && !isMegaFolder && enabled
@@ -42,7 +35,7 @@ export default function useLinksCount<T = any>({
                 exclude: ["import", "upgrade", "newLink"],
               },
         )}`
-      : admin
+      : subdomain === "admin"
         ? `/api/admin/links/count${getQueryString({
             ...query,
           })}`

diff --git a/apps/web/lib/swr/use-links.ts b/apps/web/lib/swr/use-links.ts
@@ -1,6 +1,5 @@
-import { useRouterStuff } from "@dub/ui";
+import { useCurrentSubdomain, useRouterStuff } from "@dub/ui";
 import { fetcher } from "@dub/utils";
-import { useEffect, useState } from "react";
 import useSWR, { SWRConfiguration } from "swr";
 import { z } from "zod";
 import { ExpandedLinkProps, UserProps } from "../types";
@@ -18,12 +17,7 @@ export default function useLinks(
   const { getQueryString } = useRouterStuff();
   const { isMegaFolder } = useIsMegaFolder();
 
-  const [admin, setAdmin] = useState(false);
-  useEffect(() => {
-    if (window.location.host.startsWith("admin.")) {
-      setAdmin(true);
-    }
-  }, []);
+  const { subdomain } = useCurrentSubdomain();
 
   const {
     data: links,
@@ -62,7 +56,7 @@ export default function useLinks(
             ],
           },
         )}`
-      : admin
+      : subdomain === "admin"
         ? `/api/admin/links${getQueryString(opts)}`
         : null,
     fetcher,

diff --git a/apps/web/ui/account/upload-avatar.tsx b/apps/web/ui/account/upload-avatar.tsx
@@ -43,7 +43,7 @@ export default function UploadAvatar() {
       <div className="flex flex-col space-y-3 p-5 sm:p-10">
         <h2 className="text-xl font-medium">Your Avatar</h2>
         <p className="text-sm text-neutral-500">
-          This is your avatar image on {process.env.NEXT_PUBLIC_APP_NAME}.
+          This is your avatar image on your {process.env.NEXT_PUBLIC_APP_NAME} account.
         </p>
         <div className="mt-1">
           <FileUpload

diff --git a/apps/web/ui/layout/page-content/page-content-old.tsx b/apps/web/ui/layout/page-content/page-content-old.tsx
@@ -4,7 +4,7 @@ import { ChevronLeft } from "lucide-react";
 import Link from "next/link";
 import { PropsWithChildren, ReactNode } from "react";
 import { HelpButtonRSC } from "../sidebar/help-button-rsc";
-import UserDropdownOld from "../sidebar/user-dropdown-old";
+import UserDropdown from "../sidebar/user-dropdown";
 import { NavButton } from "./nav-button";
 
 /**
@@ -74,7 +74,7 @@ export function PageContentOld({
           {showControls && (
             <div className="flex items-center gap-4 md:hidden">
               <HelpButtonRSC />
-              <UserDropdownOld />
+              <UserDropdown />
             </div>
           )}
         </div>

diff --git a/apps/web/ui/layout/sidebar/user-dropdown-old.tsx b/apps/web/ui/layout/sidebar/user-dropdown-old.tsx