Version Packages (#8470)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

AGENTS.md

@@ -18,7 +18,7 @@ Welcome, AI copilots! This guide captures the coding standards, architectural de
 2. Formatting & Linting
 
 - Biome governs formatting and linting; its rules live in biome.json.
-- Run pnpm biome check --apply before committing.
+- Run `pnpm fix` & `pnpm lint` before committing, make sure there are no linting errors.
 - Avoid editor‑specific configs; rely on the shared settings.
 - make sure everything builds after each file change by running `pnpm build`
 
@@ -136,7 +136,7 @@ export function reportContractDeployed(properties: {
 }
 ```
 
-- **Client-side only**: never import `posthog-js` in server components.  
+- **Client-side only**: never import `posthog-js` in server components.
 - **Housekeeping**: Inform **#eng-core-services** before renaming or removing an existing event.
 
 ⸻

apps/dashboard/framer-rewrites.js

@@ -21,6 +21,7 @@ module.exports = [
   "/rpc",
   "/insight",
   "/storage",
+  "/gateway",
   // -- end scale category
 
   // -- ai

apps/dashboard/package.json

@@ -48,6 +48,7 @@
     "next-themes": "^0.4.6",
     "nextjs-toploader": "^1.6.12",
     "nuqs": "^2.4.3",
+    "p-limit": "^7.2.0",
     "papaparse": "^5.5.3",
     "pluralize": "^8.0.0",
     "posthog-js": "1.256.1",

apps/dashboard/redirects.js

@@ -115,6 +115,16 @@ const projectPageRedirects = [
     permanent: false,
     source: `${projectRoute}/connect/analytics`,
   },
+  {
+    destination: `${projectRoute}/gateway/indexer/:path*`,
+    permanent: false,
+    source: `${projectRoute}/insight/:path*`,
+  },
+  {
+    destination: `${projectRoute}/gateway/rpc/:path*`,
+    permanent: false,
+    source: `${projectRoute}/rpc/:path*`,
+  },
 ];
 
 const teamPageRedirects = [

apps/dashboard/src/@/actions/revalidate.ts

@@ -1,6 +1,6 @@
 "use server";
 
-import { revalidatePath } from "next/cache";
+import { revalidatePath, revalidateTag } from "next/cache";
 
 export async function revalidatePathAction(
   path: string,
@@ -8,3 +8,7 @@ export async function revalidatePathAction(
 ) {
   revalidatePath(path, type);
 }
+
+export async function revalidateCacheTagAction(tag: string) {
+  revalidateTag(tag);
+}

apps/dashboard/src/@/api/analytics.ts

@@ -1,21 +1,24 @@
 import "server-only";
 
 import { unstable_cache } from "next/cache";
+import { getWalletInfo, type WalletId } from "thirdweb/wallets";
 import { ANALYTICS_SERVICE_URL } from "@/constants/server-envs";
 import { normalizeTime } from "@/lib/time";
 import type {
   AIUsageStats,
   AnalyticsQueryParams,
   EcosystemWalletStats,
-  EngineCloudStats,
   InAppWalletStats,
   TransactionStats,
   UniversalBridgeStats,
   UniversalBridgeWalletStats,
   UserOpStats,
   WalletStats,
+  WalletStatsWithName,
   WebhookLatencyStats,
   WebhookSummaryStats,
+  X402QueryParams,
+  X402SettlementStats,
 } from "@/types/analytics";
 import { getChains } from "./chain";
 
@@ -146,13 +149,7 @@ const cached_getWalletConnections = unstable_cache(
     }
 
     const json = await res.json();
-    return (json.data as WalletStats[]).filter(
-      (w) =>
-        w.walletType !== "smart" &&
-        w.walletType !== "smartWallet" &&
-        w.walletType !== "inApp" &&
-        w.walletType !== "inAppWallet",
-    );
+    return json.data as WalletStats[];
   },
   ["getWalletConnections"],
   {
@@ -160,11 +157,116 @@ const cached_getWalletConnections = unstable_cache(
   },
 );
 
-export function getWalletConnections(
+const cache_getEOAWalletConnections = unstable_cache(
+  async (
+    params: AnalyticsQueryParams,
+    authToken: string,
+  ): Promise<WalletStatsWithName[]> => {
+    const result = await cached_getWalletConnections(
+      normalizedParams(params),
+      authToken,
+    );
+    const filteredResult = result.filter(
+      (w) =>
+        w.walletType !== "smart" &&
+        w.walletType !== "smartWallet" &&
+        w.walletType !== "inApp" &&
+        w.walletType !== "inAppWallet",
+    );
+
+    const modifiedResult = await Promise.all(
+      filteredResult.map(async (w) => {
+        const wallet = await getWalletInfo(w.walletType as WalletId).catch(
+          () => undefined,
+        );
+
+        if (!wallet) {
+          return {
+            ...w,
+            walletName: w.walletType,
+          };
+        }
+
+        return {
+          ...w,
+          walletName: wallet.name,
+        };
+      }),
+    );
+
+    return modifiedResult;
+  },
+  ["getEOAWalletConnections"],
+  {
+    revalidate: 60 * 60, // 1 hour
+  },
+);
+
+export async function getEOAWalletConnections(
   params: AnalyticsQueryParams,
   authToken: string,
 ) {
-  return cached_getWalletConnections(normalizedParams(params), authToken);
+  return cache_getEOAWalletConnections(normalizedParams(params), authToken);
+}
+
+const cache_getEOAAndInAppWalletConnections = unstable_cache(
+  async (
+    params: AnalyticsQueryParams,
+    authToken: string,
+  ): Promise<WalletStatsWithName[]> => {
+    const result = await cached_getWalletConnections(
+      normalizedParams(params),
+      authToken,
+    );
+
+    const modifiedResult = await Promise.all(
+      result.map(async (w) => {
+        if (
+          w.walletType === "inApp" ||
+          w.walletType === "inAppWallet" ||
+          w.walletType === "smart" ||
+          w.walletType === "smartWallet"
+        ) {
+          return {
+            ...w,
+            walletName: "User wallet",
+          };
+        }
+
+        const wallet = await getWalletInfo(w.walletType as WalletId).catch(
+          () => undefined,
+        );
+
+        if (!wallet) {
+          return {
+            ...w,
+            walletName: w.walletType,
+          };
+        }
+
+        return {
+          ...w,
+          walletName: wallet.name,
+        };
+      }),
+    );
+
+    return modifiedResult;
+  },
+  ["getEOAAndInAppWalletConnections"],
+  {
+    revalidate: 60 * 60, // 1 hour
+  },
+);
+
+export async function getEOAAndInAppWalletConnections(
+  params: AnalyticsQueryParams,
+  authToken: string,
+): Promise<WalletStatsWithName[]> {
+  return cache_getEOAAndInAppWalletConnections(
+    normalizedParams(params),
+    authToken,
+  );
 }
 
 const cached_getInAppWalletUsage = unstable_cache(
@@ -184,7 +286,7 @@ const cached_getInAppWalletUsage = unstable_cache(
     if (res?.status !== 200) {
       const reason = await res?.text();
       console.error(
-        `Failed to fetch in-app wallet usage, ${res?.status} - ${res.statusText} - ${reason}`,
+        `Failed to fetch user wallets usage, ${res?.status} - ${res.statusText} - ${reason}`,
       );
       return [];
     }
@@ -289,8 +391,11 @@ const cached_getAggregateUserOpUsage = unstable_cache(
     ]);
 
     // Aggregate stats across wallet types
-    return userOpStats.reduce(
-      (acc, curr) => {
+    const aggregated = userOpStats.reduce(
+      (
+        acc: UserOpStats & { gasPriceSum: number; gasPriceCount: number },
+        curr,
+      ) => {
         // Skip testnets from the aggregated stats
         if (curr.chainId) {
           const chain = chains.data.find(
@@ -304,6 +409,10 @@ const cached_getAggregateUserOpUsage = unstable_cache(
         acc.successful += curr.successful;
         acc.failed += curr.failed;
         acc.sponsoredUsd += curr.sponsoredUsd;
+        acc.gasUnits += curr.gasUnits;
+        // For avgGasPrice, we'll track sum and count for proper averaging
+        acc.gasPriceSum += curr.avgGasPrice * curr.successful;
+        acc.gasPriceCount += curr.successful;
         return acc;
       },
       {
@@ -311,8 +420,28 @@ const cached_getAggregateUserOpUsage = unstable_cache(
         failed: 0,
         sponsoredUsd: 0,
         successful: 0,
+        gasUnits: 0,
+        avgGasPrice: 0,
+        gasPriceSum: 0,
+        gasPriceCount: 0,
       },
     );
+
+    // Calculate the proper average gas price
+    aggregated.avgGasPrice =
+      aggregated.gasPriceCount > 0
+        ? aggregated.gasPriceSum / aggregated.gasPriceCount
+        : 0;
+
+    // Return only the UserOpStats fields
+    return {
+      date: aggregated.date,
+      failed: aggregated.failed,
+      sponsoredUsd: aggregated.sponsoredUsd,
+      successful: aggregated.successful,
+      gasUnits: aggregated.gasUnits,
+      avgGasPrice: aggregated.avgGasPrice,
+    };
   },
   ["getAggregateUserOpUsage"],
   {
@@ -662,41 +791,6 @@ export function getUniversalBridgeWalletUsage(
   );
 }
 
-const cached_getEngineCloudMethodUsage = unstable_cache(
-  async (
-    params: AnalyticsQueryParams,
-    authToken: string,
-  ): Promise<EngineCloudStats[]> => {
-    const searchParams = buildSearchParams(params);
-    const res = await fetchAnalytics({
-      authToken,
-      url: `v2/engine-cloud/requests?${searchParams.toString()}`,
-      init: {
-        method: "GET",
-      },
-    });
-
-    if (res?.status !== 200) {
-      console.error("Failed to fetch Engine Cloud method usage");
-      return [];
-    }
-
-    const json = await res.json();
-    return json.data as EngineCloudStats[];
-  },
-  ["getEngineCloudMethodUsage"],
-  {
-    revalidate: 60 * 60, // 1 hour
-  },
-);
-
-export function getEngineCloudMethodUsage(
-  params: AnalyticsQueryParams,
-  authToken: string,
-) {
-  return cached_getEngineCloudMethodUsage(normalizedParams(params), authToken);
-}
-
 const _cached_getWebhookSummary = unstable_cache(
   async (
     params: AnalyticsQueryParams & { webhookId: string },
@@ -906,3 +1000,43 @@ export function getInsightUsage(
 ) {
   return cached_getInsightUsage(normalizedParams(params), authToken);
 }
+
+const cached_getX402Settlements = unstable_cache(
+  async (
+    params: X402QueryParams,
+    authToken: string,
+  ): Promise<X402SettlementStats[]> => {
+    const searchParams = buildSearchParams(params);
+
+    if (params.groupBy) {
+      searchParams.append("groupBy", params.groupBy);
+    }
+
+    const res = await fetchAnalytics({
+      authToken,
+      url: `v2/x402/settlements?${searchParams.toString()}`,
+      init: {
+        method: "GET",
+      },
+    });
+
+    if (res?.status !== 200) {
+      const reason = await res?.text();
+      console.error(
+        `Failed to fetch x402 settlements: ${res?.status} - ${res.statusText} - ${reason}`,
+      );
+      return [];
+    }
+
+    const json = await res.json();
+    return json.data as X402SettlementStats[];
+  },
+  ["getX402Settlements"],
+  {
+    revalidate: 60 * 60, // 1 hour
+  },
+);
+
+export function getX402Settlements(params: X402QueryParams, authToken: string) {
+  return cached_getX402Settlements(normalizedParams(params), authToken);
+}

apps/dashboard/src/@/api/project/cache-tag.ts

@@ -0,0 +1,6 @@
+export function projectContractsCacheTag(params: {
+  teamId: string;
+  projectId: string;
+}) {
+  return `${params.teamId}/${params.projectId}/project-contracts`;
+}

apps/dashboard/src/@/api/project/getSortedDeployedContracts.tsx

@@ -1,58 +1,111 @@
+import { unstable_cache } from "next/cache";
+import pLimit from "p-limit";
+import { defineChain } from "thirdweb";
+import { getContract } from "thirdweb/contract";
 import {
   getProjectContracts,
   type ProjectContract,
 } from "@/api/project/getProjectContracts";
-import { fetchChainWithLocalOverrides } from "@/utils/fetchChainWithLocalOverrides";
+import { supportedERCs } from "@/utils/supportedERCs";
+import { serverThirdwebClient } from "../../constants/thirdweb-client.server";
+import { resolveFunctionSelectors } from "../../lib/selectors";
+import { projectContractsCacheTag } from "./cache-tag";
 
-export async function getSortedDeployedContracts(params: {
-  onlyMainnet?: boolean;
+type GetFilteredProjectContractsParams = {
   teamId: string;
   projectId: string;
   authToken: string;
-  deploymentType: string | undefined;
-}) {
+};
+
+type ProjectContractWithIsToken = ProjectContract & { isToken: boolean };
+
+async function getProjectContractsWithIsTokenInfo(
+  params: GetFilteredProjectContractsParams,
+): Promise<ProjectContractWithIsToken[]> {
   const contracts = await getProjectContracts({
     authToken: params.authToken,
-    deploymentType: params.deploymentType,
+    deploymentType: undefined, // don't pass it to api to fetch all contracts, we'll filter/merge manually here
     projectId: params.projectId,
     teamId: params.teamId,
   });
 
-  const chainIds = Array.from(new Set(contracts.map((c) => c.chainId)));
-  const chains = (
-    await Promise.allSettled(
-      chainIds.map((chainId) =>
-        fetchChainWithLocalOverrides(chainId.toString()),
-      ),
-    )
-  )
-    .filter((c) => c.status === "fulfilled")
-    .map((c) => c.value)
-    .filter((c) => c !== null);
+  const assetContracts = contracts.filter((c) => c.deploymentType === "asset");
+  const otherContracts = contracts.filter((c) => c.deploymentType !== "asset");
 
-  const mainnetContracts: ProjectContract[] = [];
-  const testnetContracts: ProjectContract[] = [];
+  // "asset" deployment type contract is assumed to be a "token" type contract already
+  // for others, check if its a "token" type contract (isERC20, isERC721 or isERC1155)
 
-  for (const contract of contracts) {
-    const chain = chains.find(
-      (chain) => contract.chainId === chain.chainId.toString(),
+  const limit = pLimit(20);
+
+  const othersContractWithIsTokenInfo: ProjectContractWithIsToken[] =
+    await Promise.all(
+      otherContracts.map(async (c) => {
+        return limit(async () => {
+          try {
+            const contract = getContract({
+              address: c.contractAddress,
+              // eslint-disable-next-line no-restricted-syntax
+              chain: defineChain(Number(c.chainId)),
+              client: serverThirdwebClient,
+            });
+
+            const functionSelectors = await resolveFunctionSelectors(contract);
+            const ercs = supportedERCs(functionSelectors);
+            if (ercs.isERC20 || ercs.isERC721 || ercs.isERC1155) {
+              return {
+                ...c,
+                isToken: true,
+              };
+            }
+            return {
+              ...c,
+              isToken: false,
+            };
+          } catch {
+            return {
+              ...c,
+              isToken: false,
+            };
+          }
+        });
+      }),
     );
-    if (chain && chain.status !== "deprecated") {
-      if (chain.testnet) {
-        testnetContracts.push(contract);
-      } else {
-        mainnetContracts.push(contract);
-      }
+
+  for (const c of othersContractWithIsTokenInfo) {
+    if (c.deploymentType === "asset") {
+      assetContracts.push(c);
+    } else {
+      otherContracts.push(c);
     }
   }
 
-  mainnetContracts.sort((a, b) => Number(a.chainId) - Number(b.chainId));
-
-  if (params.onlyMainnet) {
-    return mainnetContracts;
-  }
-
-  testnetContracts.sort((a, b) => Number(a.chainId) - Number(b.chainId));
-
-  return [...mainnetContracts, ...testnetContracts];
+  return [
+    ...assetContracts.map(
+      (c) => ({ ...c, isToken: true }) as ProjectContractWithIsToken,
+    ),
+    ...othersContractWithIsTokenInfo,
+  ];
+}
+
+export async function getFilteredProjectContracts(
+  params: GetFilteredProjectContractsParams & {
+    type: "token-contracts" | "non-token-contracts";
+  },
+) {
+  const cached_getProjectContractsWithIsTokenInfo = unstable_cache(
+    getProjectContractsWithIsTokenInfo,
+    ["get-project-contracts-with-is-token-info"],
+    {
+      revalidate: 3600, // 1 hour
+      tags: [projectContractsCacheTag(params)],
+    },
+  );
+
+  const contracts = await cached_getProjectContractsWithIsTokenInfo(params);
+
+  if (params.type === "token-contracts") {
+    return contracts.filter((c) => c.isToken);
+  } else {
+    return contracts.filter((c) => !c.isToken);
+  }
 }

apps/dashboard/src/@/api/team/ecosystems.ts

@@ -21,7 +21,8 @@ export type AuthOption =
   | "steam"
   | "apple"
   | "coinbase"
-  | "line";
+  | "line"
+  | "epic";
 
 export type Ecosystem = {
   name: string;

apps/dashboard/src/@/api/team/get-team.ts

@@ -8,7 +8,10 @@ import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { API_SERVER_SECRET } from "@/constants/server-envs";
 import { getMemberByAccountId } from "./team-members";
 
-export type Team = TeamResponse & { stripeCustomerId: string | null };
+export type Team = TeamResponse & {
+  stripeCustomerId: string | null;
+  isLegacyPlan: boolean;
+};
 
 export async function getTeamBySlug(slug: string) {
   const token = await getAuthToken();

apps/dashboard/src/@/api/x402/config.ts

@@ -0,0 +1,27 @@
+import type { Project } from "@/api/project/projects";
+
+type X402Fee = {
+  feeRecipient: string;
+  feeBps: number;
+};
+
+/**
+ * Extract x402 fee configuration from project's engineCloud service
+ */
+export function getX402Fees(project: Project): X402Fee {
+  const engineCloudService = project.services.find(
+    (service) => service.name === "engineCloud",
+  );
+
+  if (!engineCloudService) {
+    return {
+      feeRecipient: "",
+      feeBps: 0,
+    };
+  }
+
+  return {
+    feeRecipient: engineCloudService.x402FeeRecipient || "",
+    feeBps: engineCloudService.x402FeeBPS || 0,
+  };
+}

apps/dashboard/src/@/components/analytics/empty-chart-state.tsx

@@ -1,4 +1,5 @@
 "use client";
+import { XIcon } from "lucide-react";
 import { useId, useMemo } from "react";
 import { Area, AreaChart, Bar, BarChart } from "recharts";
 import { type ChartConfig, ChartContainer } from "@/components/ui/chart";
@@ -33,8 +34,15 @@ export function EmptyChartState({
 
   return (
     <div className="relative z-0 h-full w-full">
-      <div className="absolute inset-0 z-[1] flex flex-col items-center justify-center font-medium text-base text-muted-foreground">
-        {children ?? "No data available"}
+      <div className="absolute inset-0 z-[1] flex flex-col items-center justify-center text-base text-muted-foreground">
+        {children ?? (
+          <div className="flex items-center gap-3 flex-col">
+            <div className="rounded-full border p-2 bg-background">
+              <XIcon className="size-4" />
+            </div>
+            <p className="text-base"> No data available </p>
+          </div>
+        )}
       </div>
       <SkeletonBarChart data={barChartData} type={type} />
     </div>
@@ -61,7 +69,7 @@ function SkeletonBarChart(props: {
   const fillAreaSkeletonId = useId();
   return (
     <ChartContainer
-      className="pointer-events-none h-full w-full blur-[5px]"
+      className="pointer-events-none h-full w-full blur-[5px] aspect-auto"
       config={skeletonChartConfig}
     >
       {props.type === "bar" ? (

apps/dashboard/src/@/components/blocks/ExportToCSVButton.tsx

@@ -34,7 +34,8 @@ export function ExportToCSVButton(props: {
 
   return (
     <Button
-      className={cn("flex items-center gap-2 border text-xs", props.className)}
+      className={cn("gap-2 rounded-full", props.className)}
+      size="sm"
       disabled={props.disabled || exportMutation.isPending}
       onClick={async () => {
         exportMutation.mutate();
@@ -42,16 +43,11 @@ export function ExportToCSVButton(props: {
       variant="outline"
     >
       {exportMutation.isPending ? (
-        <>
-          Downloading
-          <Spinner className="size-3" />
-        </>
+        <Spinner className="size-3.5 text-muted-foreground" />
       ) : (
-        <>
-          <DownloadIcon className="size-3" />
-          Export as CSV
-        </>
+        <DownloadIcon className="size-3.5 text-muted-foreground" />
       )}
+      Export
     </Button>
   );
 }

apps/dashboard/src/@/components/blocks/GatedSwitch.stories.tsx

@@ -70,6 +70,7 @@ function Variants() {
             key={currentPlan}
             requiredPlan={requiredPlan}
             teamSlug="foo"
+            isLegacyPlan={false}
           />
         </BadgeContainer>
       ))}

apps/dashboard/src/@/components/blocks/GatedSwitch.tsx

@@ -14,6 +14,7 @@ type GatedSwitchProps = {
   trackingLabel?: string;
   currentPlan: Team["billingPlan"];
   requiredPlan: Team["billingPlan"];
+  isLegacyPlan: boolean;
   teamSlug: string;
   switchProps?: SwitchProps;
 };
@@ -33,7 +34,7 @@ export const GatedSwitch: React.FC<GatedSwitchProps> = (
           <div className="w-full min-w-[280px]">
             <h3 className="font-medium text-base">
               <span className="capitalize">
-                {getTeamPlanBadgeLabel(props.requiredPlan)}+
+                {getTeamPlanBadgeLabel(props.requiredPlan, false)}+
               </span>{" "}
               plan required
             </h3>
@@ -48,7 +49,8 @@ export const GatedSwitch: React.FC<GatedSwitchProps> = (
                   rel="noopener noreferrer"
                   target="_blank"
                 >
-                  Upgrade to {getTeamPlanBadgeLabel(props.requiredPlan)} plan
+                  Upgrade to {getTeamPlanBadgeLabel(props.requiredPlan, false)}{" "}
+                  plan
                   <ExternalLinkIcon className="size-4" />
                 </Link>
               </Button>
@@ -61,6 +63,7 @@ export const GatedSwitch: React.FC<GatedSwitchProps> = (
         {isUpgradeRequired && (
           <TeamPlanBadge
             plan={props.requiredPlan}
+            isLegacyPlan={props.isLegacyPlan}
             postfix="+"
             teamSlug={props.teamSlug}
           />

apps/dashboard/src/@/components/blocks/TeamPlanBadge.tsx

@@ -23,28 +23,42 @@ const teamPlanToBadgeVariant: Record<
   starter: "warning",
 };
 
-export function getTeamPlanBadgeLabel(plan: Team["billingPlan"]) {
+export function getTeamPlanBadgeLabel(
+  plan: Team["billingPlan"],
+  isLegacyPlan: boolean,
+) {
   if (plan === "growth_legacy") {
     return "Growth - Legacy";
   }
 
+  if (isLegacyPlan) {
+    return `${plan} - Legacy`;
+  }
+
   return plan;
 }
 
 export function TeamPlanBadge(props: {
   teamSlug: string;
   plan: Team["billingPlan"];
+  isLegacyPlan: boolean;
   className?: string;
   postfix?: string;
 }) {
   const router = useDashboardRouter();
 
   function handleNavigateToBilling(e: React.MouseEvent | React.KeyboardEvent) {
+    e.stopPropagation();
+    e.preventDefault();
+
+    if (props.isLegacyPlan) {
+      router.push(`/team/${props.teamSlug}/~/billing`);
+      return;
+    }
+
     if (props.plan !== "free") {
       return;
     }
-    e.stopPropagation();
-    e.preventDefault();
     router.push(`/team/${props.teamSlug}/~/billing?showPlans=true`);
   }
 
@@ -57,11 +71,13 @@ export function TeamPlanBadge(props: {
           handleNavigateToBilling(e);
         }
       }}
-      role={props.plan === "free" ? "button" : undefined}
-      tabIndex={props.plan === "free" ? 0 : undefined}
-      variant={teamPlanToBadgeVariant[props.plan]}
+      role={props.plan === "free" || props.isLegacyPlan ? "button" : undefined}
+      tabIndex={props.plan === "free" || props.isLegacyPlan ? 0 : undefined}
+      variant={
+        props.isLegacyPlan ? "warning" : teamPlanToBadgeVariant[props.plan]
+      }
     >
-      {`${getTeamPlanBadgeLabel(props.plan)}${props.postfix || ""}`}
+      {`${getTeamPlanBadgeLabel(props.plan, props.isLegacyPlan)}${props.postfix || ""}`}
     </Badge>
   );
 }

apps/dashboard/src/@/components/blocks/charts/area-chart.tsx

@@ -40,7 +40,7 @@ type ThirdwebAreaChartProps<TConfig extends ChartConfig> = {
 
   yAxis?: boolean;
   xAxis?: {
-    sameDay?: boolean;
+    showHour?: boolean;
   };
 
   variant?: "stacked" | "individual";
@@ -112,7 +112,7 @@ export function ThirdwebAreaChart<TConfig extends ChartConfig>(
                 tickFormatter={(value) =>
                   format(
                     new Date(value),
-                    props.xAxis?.sameDay ? "MMM dd, HH:mm" : "MMM dd",
+                    props.xAxis?.showHour ? "MMM dd, HH:mm" : "MMM dd",
                   )
                 }
                 tickLine={false}

apps/dashboard/src/@/components/blocks/charts/automerge-barchart.stories.tsx

@@ -1,12 +1,11 @@
 import type { Meta, StoryObj } from "@storybook/nextjs";
 import type { InAppWalletAuth } from "thirdweb/wallets";
 import { BadgeContainer } from "@/storybook/utils";
-import type { InAppWalletStats } from "@/types/analytics";
-import { InAppWalletUsersChartCardUI } from "./InAppWalletUsersChartCard";
+import { AutoMergeBarChart, type StatData } from "./automerge-barchart";
 
 const meta = {
   component: Component,
-  title: "Charts/InAppWallets",
+  title: "Charts/AutoMergeBarChart",
 } satisfies Meta<typeof Component>;
 
 export default meta;
@@ -19,60 +18,109 @@ export const Variants: Story = {
 function Component() {
   const title = "This is Title";
   const description =
-    "This is an example of a description about in-app wallet usage chart";
+    "This is an example of a description about user wallet usage chart";
   return (
     <div className="container flex max-w-6xl flex-col gap-10 py-10">
-      <BadgeContainer label="30 days">
-        <InAppWalletUsersChartCardUI
+      <BadgeContainer label="10 days, view more variant">
+        <AutoMergeBarChart
+          viewMoreLink={"#"}
           description={description}
-          inAppWalletStats={createInAppWalletStatsStub(30)}
+          stats={createStatsStub(10)}
           isPending={false}
           title={title}
+          maxLabelsToShow={5}
+          emptyChartState={undefined}
+          exportButton={undefined}
+        />
+      </BadgeContainer>
+
+      <BadgeContainer label="30 days">
+        <AutoMergeBarChart
+          viewMoreLink={undefined}
+          description={description}
+          stats={createStatsStub(30)}
+          isPending={false}
+          title={title}
+          maxLabelsToShow={5}
+          emptyChartState={undefined}
+          exportButton={{
+            fileName: "in-app-wallets",
+          }}
         />
       </BadgeContainer>
 
       <BadgeContainer label="60 days">
-        <InAppWalletUsersChartCardUI
+        <AutoMergeBarChart
+          viewMoreLink={undefined}
           description={description}
-          inAppWalletStats={createInAppWalletStatsStub(60)}
+          stats={createStatsStub(60)}
           isPending={false}
           title={title}
+          maxLabelsToShow={5}
+          emptyChartState={undefined}
+          exportButton={{
+            fileName: "in-app-wallets",
+          }}
         />
       </BadgeContainer>
 
       <BadgeContainer label="120 days">
-        <InAppWalletUsersChartCardUI
+        <AutoMergeBarChart
+          viewMoreLink={undefined}
           description={description}
-          inAppWalletStats={createInAppWalletStatsStub(120)}
+          stats={createStatsStub(120)}
           isPending={false}
           title={title}
+          maxLabelsToShow={5}
+          emptyChartState={undefined}
+          exportButton={{
+            fileName: "in-app-wallets",
+          }}
         />
       </BadgeContainer>
 
       <BadgeContainer label="10 days">
-        <InAppWalletUsersChartCardUI
+        <AutoMergeBarChart
+          viewMoreLink={undefined}
           description={description}
-          inAppWalletStats={createInAppWalletStatsStub(10)}
+          stats={createStatsStub(10)}
           isPending={false}
           title={title}
+          maxLabelsToShow={5}
+          emptyChartState={undefined}
+          exportButton={{
+            fileName: "in-app-wallets",
+          }}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Empty List">
-        <InAppWalletUsersChartCardUI
+        <AutoMergeBarChart
+          viewMoreLink={undefined}
           description={description}
-          inAppWalletStats={createInAppWalletStatsStub(0)}
+          stats={createStatsStub(0)}
           isPending={false}
           title={title}
+          maxLabelsToShow={5}
+          emptyChartState={undefined}
+          exportButton={{
+            fileName: "in-app-wallets",
+          }}
         />
       </BadgeContainer>
 
       <BadgeContainer label="Pending">
-        <InAppWalletUsersChartCardUI
+        <AutoMergeBarChart
+          viewMoreLink={undefined}
           description={description}
-          inAppWalletStats={[]}
+          stats={[]}
           isPending={true}
           title={title}
+          maxLabelsToShow={5}
+          emptyChartState={undefined}
+          exportButton={{
+            fileName: "in-app-wallets",
+          }}
         />
       </BadgeContainer>
     </div>
@@ -87,6 +135,7 @@ const authMethodsToPickFrom: InAppWalletAuth[] = [
   "line",
   "x",
   "tiktok",
+  "epic",
   "coinbase",
   "farcaster",
   "telegram",
@@ -110,17 +159,16 @@ const pickRandomAuthMethod = () => {
   return capitalized;
 };
 
-function createInAppWalletStatsStub(days: number): InAppWalletStats[] {
-  const stubbedData: InAppWalletStats[] = [];
+function createStatsStub(days: number): StatData[] {
+  const stubbedData: StatData[] = [];
 
   let d = days;
   while (d !== 0) {
     const uniqueWallets = Math.floor(Math.random() * 100);
     stubbedData.push({
-      authenticationMethod: pickRandomAuthMethod(),
+      label: pickRandomAuthMethod(),
       date: new Date(2024, 11, d).toLocaleString(),
-      uniqueWalletsConnected: uniqueWallets,
-      newUsers: Math.floor(Math.random() * 100) + 1,
+      count: uniqueWallets,
     });
 
     if (Math.random() > 0.7) {

apps/dashboard/src/@/components/blocks/charts/automerge-barchart.tsx

@@ -0,0 +1,173 @@
+"use client";
+import { format } from "date-fns";
+import { useMemo } from "react";
+import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
+import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
+import type { ChartConfig } from "@/components/ui/chart";
+import { TotalValueChartHeader } from "./chart-header";
+
+export type StatData = {
+  date: string;
+  count: number;
+  label: string;
+};
+
+type ChartData = Record<string, number> & {
+  time: string; // human readable date
+};
+
+const defaultLabel = "Unknown";
+
+// merges the multiple stats in single bar if they share the same date
+// shows the top `maxLabelsToShow` labels, merge the rest into "Others"
+
+export function AutoMergeBarChart(props: {
+  stats: StatData[];
+  isPending: boolean;
+  title: string;
+  emptyChartState: React.ReactElement | undefined;
+  description: string | undefined;
+  maxLabelsToShow: number;
+  exportButton:
+    | {
+        fileName: string;
+      }
+    | undefined;
+  viewMoreLink: string | undefined;
+}) {
+  const { stats, maxLabelsToShow } = props;
+
+  const { chartConfig, chartData } = useMemo(() => {
+    const _chartConfig: ChartConfig = {};
+    const _chartDataMap: Map<string, ChartData> = new Map();
+    const labelToCountMap: Map<string, number> = new Map();
+    // for each stat, add it in _chartDataMap
+    for (const stat of stats) {
+      const chartData = _chartDataMap.get(stat.date);
+
+      // if no data for current day - create new entry
+      if (!chartData && stat.count > 0) {
+        _chartDataMap.set(stat.date, {
+          time: stat.date,
+          [stat.label || defaultLabel]: stat.count,
+        } as ChartData);
+      } else if (chartData) {
+        chartData[stat.label || defaultLabel] =
+          (chartData[stat.label || defaultLabel] || 0) + stat.count;
+      }
+
+      labelToCountMap.set(
+        stat.label || defaultLabel,
+        stat.count + (labelToCountMap.get(stat.label || defaultLabel) || 0),
+      );
+    }
+
+    const labelsSorted = Array.from(labelToCountMap.entries())
+      .sort((a, b) => b[1] - a[1])
+      .map((w) => w[0]);
+
+    const labelsToShow = labelsSorted.slice(0, maxLabelsToShow);
+    const labelsToShowAsOther = labelsSorted.slice(maxLabelsToShow);
+
+    // replace chainIdsToTagAsOther chainId with "other"
+    for (const data of _chartDataMap.values()) {
+      for (const dataKey in data) {
+        if (labelsToShowAsOther.includes(dataKey)) {
+          data.others = (data.others || 0) + (data[dataKey] || 0);
+          delete data[dataKey];
+        }
+      }
+    }
+
+    labelsToShow.forEach((walletType, i) => {
+      _chartConfig[walletType] = {
+        color: `hsl(var(--chart-${(i % 10) + 1}))`,
+        label: labelsToShow[i],
+      };
+    });
+
+    // Add Other
+    if (labelsToShow.length >= maxLabelsToShow) {
+      labelsToShow.push("others");
+      _chartConfig.others = {
+        color: "hsl(var(--muted-foreground))",
+        label: "Others",
+      };
+    }
+
+    return {
+      chartConfig: _chartConfig,
+      chartData: Array.from(_chartDataMap.values()).sort(
+        (a, b) => new Date(a.time).getTime() - new Date(b.time).getTime(),
+      ),
+    };
+  }, [stats, maxLabelsToShow]);
+
+  const uniqueLabels = Object.keys(chartConfig);
+
+  const total = useMemo(() => {
+    return props.stats.reduce((acc, stat) => acc + stat.count, 0);
+  }, [props.stats]);
+
+  return (
+    <ThirdwebBarChart
+      chartClassName="h-[275px] w-full"
+      config={chartConfig}
+      customHeader={
+        props.viewMoreLink ? (
+          <TotalValueChartHeader
+            total={total}
+            title={props.title}
+            isPending={props.isPending}
+            viewMoreLink={props.viewMoreLink}
+          />
+        ) : (
+          <div className="relative px-6 pt-6">
+            <div className="space-y-1">
+              <h3 className="font-semibold text-lg tracking-tight leading-none">
+                {props.title}
+              </h3>
+              {props.description && (
+                <p className="text-muted-foreground text-sm">
+                  {props.description}
+                </p>
+              )}
+            </div>
+
+            {props.exportButton && props.stats.length > 0 && (
+              <ExportToCSVButton
+                className="top-6 right-6 mb-4 w-full bg-background md:absolute md:mb-0 md:flex md:w-auto"
+                fileName={props.exportButton.fileName}
+                getData={async () => {
+                  // Shows the number of each type of wallet connected on all dates
+                  const header = ["Time", ...uniqueLabels];
+                  const rows = chartData.map((data) => {
+                    const { time, ...rest } = data;
+                    return [
+                      new Date(time).toISOString(),
+                      ...uniqueLabels.map((w) => (rest[w] || 0).toString()),
+                    ];
+                  });
+                  return { header, rows };
+                }}
+              />
+            )}
+          </div>
+        )
+      }
+      data={chartData}
+      emptyChartState={props.emptyChartState}
+      hideLabel={false}
+      isPending={props.isPending}
+      showLegend
+      toolTipLabelFormatter={(_v, item) => {
+        if (Array.isArray(item)) {
+          const time = item[0].payload.time as number;
+          return format(new Date(time), "MMM d, yyyy");
+        }
+        return undefined;
+      }}
+      variant="stacked"
+    />
+  );
+}

apps/dashboard/src/@/components/blocks/charts/bar-chart.tsx

@@ -44,6 +44,10 @@ type ThirdwebBarChartProps<TConfig extends ChartConfig> = {
   toolTipValueFormatter?: (value: unknown) => React.ReactNode;
   hideLabel?: boolean;
   emptyChartState?: React.ReactElement;
+  className?: string;
+  xAxis?: {
+    showHour?: boolean;
+  };
 };
 
 export function ThirdwebBarChart<TConfig extends ChartConfig>(
@@ -55,7 +59,7 @@ export function ThirdwebBarChart<TConfig extends ChartConfig>(
     props.variant || configKeys.length > 4 ? "stacked" : "grouped";
 
   return (
-    <Card>
+    <Card className={cn("overflow-hidden", props.className)}>
       {props.header && (
         <CardHeader>
           <CardTitle className={cn("mb-2", props.header.titleClassName)}>
@@ -83,7 +87,12 @@ export function ThirdwebBarChart<TConfig extends ChartConfig>(
               <XAxis
                 axisLine={false}
                 dataKey="time"
-                tickFormatter={(value) => format(new Date(value), "MMM d")}
+                tickFormatter={(value) =>
+                  format(
+                    new Date(value),
+                    props.xAxis?.showHour ? "MMM dd, HH:mm" : "MMM dd",
+                  )
+                }
                 tickLine={false}
                 tickMargin={10}
               />

apps/dashboard/src/@/components/blocks/charts/chart-header.tsx

@@ -0,0 +1,50 @@
+import { ArrowUpRightIcon } from "lucide-react";
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
+import { SkeletonContainer } from "@/components/ui/skeleton";
+
+export function TotalValueChartHeader(props: {
+  total: number;
+  title: string;
+  isPending: boolean;
+  viewMoreLink: string | undefined;
+}) {
+  return (
+    <div className="space-y-1 p-6 pb-0 flex justify-between items-start gap-3">
+      <div>
+        <SkeletonContainer
+          loadedData={!props.isPending ? props.total : undefined}
+          skeletonData={100}
+          render={(value) => {
+            return (
+              <p className="text-3xl font-semibold tracking-tight">
+                {compactNumberFormatter.format(value)}
+              </p>
+            );
+          }}
+        />
+
+        <h3 className="text-muted-foreground">{props.title}</h3>
+      </div>
+
+      {props.viewMoreLink && (
+        <Button
+          asChild
+          size="sm"
+          variant="outline"
+          className="gap-2 rounded-full text-muted-foreground hover:text-foreground"
+        >
+          <Link href={props.viewMoreLink}>
+            <span>View More</span>
+            <ArrowUpRightIcon className="size-4" />
+          </Link>
+        </Button>
+      )}
+    </div>
+  );
+}
+
+const compactNumberFormatter = new Intl.NumberFormat("en-US", {
+  notation: "compact",
+  maximumFractionDigits: 2,
+});

apps/dashboard/src/@/components/blocks/full-width-sidebar-layout.tsx

@@ -38,11 +38,11 @@ type ShadcnSidebarBaseLink = {
   isActive?: (pathname: string) => boolean;
 };
 
-type ShadcnSidebarLink =
+export type ShadcnSidebarLink =
   | ShadcnSidebarBaseLink
   | {
       group: string;
-      links: ShadcnSidebarBaseLink[];
+      links: ShadcnSidebarLink[];
     }
   | {
       separator: true;
@@ -67,7 +67,7 @@ export function FullWidthSidebarLayout(props: {
       )}
     >
       {/* left - sidebar */}
-      <Sidebar className="pt-2" collapsible="icon" side="left">
+      <Sidebar collapsible="icon" side="left">
         <SidebarContent className="p-2">
           <RenderSidebarMenu links={contentSidebarLinks} />
         </SidebarContent>
@@ -97,10 +97,7 @@ export function FullWidthSidebarLayout(props: {
 
 function MobileSidebarTrigger(props: { links: ShadcnSidebarLink[] }) {
   const activeLink = useActiveShadcnSidebarLink(props.links);
-  const parentSubNav = props.links.find(
-    (link) =>
-      "subMenu" in link && link.links.some((l) => l.href === activeLink?.href),
-  );
+  const parentSubNav = findParentSubmenu(props.links, activeLink?.href);
 
   return (
     <div className="flex items-center gap-3 border-b px-4 py-4 lg:hidden">
@@ -109,7 +106,7 @@ function MobileSidebarTrigger(props: { links: ShadcnSidebarLink[] }) {
         className="h-4 bg-muted-foreground/50"
         orientation="vertical"
       />
-      {parentSubNav && "subMenu" in parentSubNav && (
+      {parentSubNav && (
         <>
           <span className="text-sm">{parentSubNav.subMenu.label}</span>
           <ChevronRightIcon className="size-4 text-muted-foreground/50 -mx-1.5" />
@@ -131,24 +128,65 @@ function useActiveShadcnSidebarLink(links: ShadcnSidebarLink[]) {
       return pathname?.startsWith(link.href);
     }
 
-    for (const link of links) {
-      if ("links" in link) {
-        for (const subLink of link.links) {
-          if (isActive(subLink)) {
-            return subLink;
+    function walk(
+      navLinks: ShadcnSidebarLink[],
+    ): ShadcnSidebarBaseLink | undefined {
+      for (const link of navLinks) {
+        if ("subMenu" in link) {
+          for (const subLink of link.links) {
+            if (isActive(subLink)) {
+              return subLink;
+            }
+          }
+        } else if ("href" in link) {
+          if (isActive(link)) {
+            return link;
           }
         }
-      } else if ("href" in link) {
-        if (isActive(link)) {
-          return link;
+
+        if ("links" in link && !("subMenu" in link)) {
+          const nested = walk(link.links);
+          if (nested) {
+            return nested;
+          }
         }
       }
+
+      return undefined;
     }
+
+    return walk(links);
   }, [links, pathname]);
 
   return activeLink;
 }
 
+function findParentSubmenu(
+  links: ShadcnSidebarLink[],
+  activeHref: string | undefined,
+): Extract<ShadcnSidebarLink, { subMenu: unknown }> | undefined {
+  if (!activeHref) {
+    return undefined;
+  }
+
+  for (const link of links) {
+    if ("subMenu" in link) {
+      if (link.links.some((subLink) => subLink.href === activeHref)) {
+        return link;
+      }
+    }
+
+    if ("links" in link && !("subMenu" in link)) {
+      const nested = findParentSubmenu(link.links, activeHref);
+      if (nested) {
+        return nested;
+      }
+    }
+  }
+
+  return undefined;
+}
+
 function useIsSubnavActive(links: ShadcnSidebarBaseLink[]) {
   const pathname = usePathname();
 

apps/dashboard/src/@/components/blocks/project-page/project-page-header.tsx

@@ -66,13 +66,16 @@ export type ProjectPageHeaderProps = {
     href: string;
   };
 
+  className?: string;
   // TODO: add task card component
   task?: never;
 };
 
 export function ProjectPageHeader(props: ProjectPageHeaderProps) {
   return (
-    <header className="container max-w-7xl py-6 relative">
+    <header
+      className={cn("container max-w-7xl py-6 relative", props.className)}
+    >
       {/* top row */}
       <div className="flex justify-between items-start mb-4">
         {/* left - icon */}

apps/dashboard/src/@/components/blocks/project-page/project-page.tsx

@@ -12,18 +12,20 @@ import {
 type ProjectPageProps = {
   header: ProjectPageHeaderProps;
   footer?: ProjectPageFooterProps;
-  /**
-   * @deprecated only for legacy pages where we still need internal tabs for the moment, currently:
-   * - /webhooks
-   */
   tabs?: TabPathLink[];
+  containerClassName?: string;
 };
 
 export function ProjectPage(props: React.PropsWithChildren<ProjectPageProps>) {
   return (
     <div className="flex flex-col grow">
       <div className={cn(!props.tabs && "border-b")}>
-        <ProjectPageHeader {...props.header} />
+        <ProjectPageHeader
+          {...props.header}
+          className={cn(
+            props.tabs && props.tabs.length > 0 ? "pt-8 pb-6" : "py-8",
+          )}
+        />
         {props.tabs && (
           <TabPathLinks
             scrollableClassName="container max-w-7xl"
@@ -32,7 +34,11 @@ export function ProjectPage(props: React.PropsWithChildren<ProjectPageProps>) {
         )}
       </div>
 
-      <main className="container max-w-7xl pt-6">{props.children}</main>
+      <main
+        className={cn("container max-w-7xl pt-6", props.containerClassName)}
+      >
+        {props.children}
+      </main>
       <div className="h-20" />
       {props.footer && (
         <div className="border-t mt-auto">

apps/dashboard/src/@/components/blocks/upsell-wrapper.tsx

@@ -22,6 +22,7 @@ interface UpsellWrapperProps {
   isLocked?: boolean;
   requiredPlan: Team["billingPlan"];
   currentPlan?: Team["billingPlan"];
+  isLegacyPlan?: boolean;
   featureName: string;
   featureDescription: string;
   benefits?: {
@@ -41,6 +42,7 @@ export function UpsellWrapper({
   featureDescription,
   benefits = [],
   className,
+  isLegacyPlan = false,
 }: UpsellWrapperProps) {
   if (!isLocked) {
     return <>{children}</>;
@@ -66,6 +68,7 @@ export function UpsellWrapper({
           featureDescription={featureDescription}
           featureName={featureName}
           requiredPlan={requiredPlan}
+          isLegacyPlan={isLegacyPlan}
           teamSlug={teamSlug}
         />
       </div>
@@ -79,6 +82,7 @@ export function UpsellContent(props: {
   featureDescription: string;
   requiredPlan: Team["billingPlan"];
   currentPlan: Team["billingPlan"];
+  isLegacyPlan: boolean;
   benefits?: {
     description: string;
     status: "available" | "soon";
@@ -96,6 +100,7 @@ export function UpsellContent(props: {
             plan={props.requiredPlan}
             postfix=" Feature"
             teamSlug={props.teamSlug}
+            isLegacyPlan={props.isLegacyPlan}
           />
           <div className="space-y-1">
             <CardTitle className="font-bold text-2xl text-foreground md:text-3xl">

apps/dashboard/src/@/components/contract-components/tables/contract-table.stories.tsx

@@ -62,6 +62,8 @@ function Story() {
             client={storybookThirdwebClient}
             contracts={[]}
             pageSize={10}
+            projectId="project-id"
+            teamId="team-id"
             projectSlug={projectSlug}
             removeContractFromProject={removeContractStub}
             teamSlug={teamSlug}
@@ -74,6 +76,8 @@ function Story() {
             client={storybookThirdwebClient}
             contracts={[popularPolygonNFTs[0] as ProjectContract]}
             pageSize={10}
+            projectId="project-id"
+            teamId="team-id"
             projectSlug={projectSlug}
             removeContractFromProject={removeContractStub}
             teamSlug={teamSlug}
@@ -86,6 +90,8 @@ function Story() {
             client={storybookThirdwebClient}
             contracts={popularPolygonNFTs}
             pageSize={10}
+            projectId="project-id"
+            teamId="team-id"
             projectSlug={projectSlug}
             removeContractFromProject={removeContractStub}
             teamSlug={teamSlug}
@@ -95,6 +101,8 @@ function Story() {
 
         <BadgeContainer label="10 Contracts, 2 chains">
           <ContractTableUI
+            projectId="project-id"
+            teamId="team-id"
             client={storybookThirdwebClient}
             contracts={[...popularPolygonNFTs, ...EthereumPopularNFTs]}
             pageSize={10}
@@ -114,6 +122,8 @@ function Story() {
               ...basePopularTokens,
             ]}
             pageSize={10}
+            projectId="project-id"
+            teamId="team-id"
             projectSlug={projectSlug}
             removeContractFromProject={removeContractStub}
             teamSlug={teamSlug}

apps/dashboard/src/@/components/contract-components/tables/contract-table.tsx

@@ -32,6 +32,8 @@ import { useAllChainsData } from "@/hooks/chains/allChains";
 import { removeContractFromProject } from "@/hooks/project-contracts";
 import { ChainIconClient } from "@/icons/ChainIcon";
 import { cn } from "@/lib/utils";
+import { revalidateCacheTagAction } from "../../../actions/revalidate";
+import { projectContractsCacheTag } from "../../../api/project/cache-tag";
 import {
   ContractNameCell,
   ContractTypeCell,
@@ -57,6 +59,8 @@ export function ContractTable(props: {
       client={props.client}
       contracts={props.contracts}
       pageSize={props.pageSize}
+      projectId={props.projectId}
+      teamId={props.teamId}
       projectSlug={props.projectSlug}
       removeContractFromProject={async (contractId) => {
         await removeContractFromProject({
@@ -77,6 +81,8 @@ export function ContractTableUI(props: {
   removeContractFromProject: (contractId: string) => Promise<void>;
   client: ThirdwebClient;
   variant: "asset" | "contract";
+  teamId: string;
+  projectId: string;
   teamSlug: string;
   projectSlug: string;
 }) {
@@ -243,6 +249,13 @@ export function ContractTableUI(props: {
                     <ContractActionsCell
                       contractId={contract.id}
                       onContractRemoved={() => {
+                        revalidateCacheTagAction(
+                          projectContractsCacheTag({
+                            teamId: props.teamId,
+                            projectId: props.projectId,
+                          }),
+                        );
+
                         setDeletedContractIds((v) => {
                           return [...v, contract.id];
                         });

apps/dashboard/src/@/components/contracts/code-overview.tsx

@@ -69,7 +69,7 @@ export default function Component() {
 
 // Get your contract
 var contract = await ThirdwebManager.Instance.GetContract(
-  address: "{{contract_address}}", 
+  address: "{{contract_address}}",
   chainId: {{chainId}},
 );
 
@@ -124,7 +124,7 @@ export default function Component() {
 
 // Get your contract
 var contract = await ThirdwebManager.Instance.GetContract(
-  address: "{{contract_address}}", 
+  address: "{{contract_address}}",
   chainId: {{chainId}}
 );
 
@@ -214,7 +214,7 @@ function App() {
 
 // Get your contract
 var contract = await ThirdwebManager.Instance.GetContract(
-  address: "{{contract_address}}", 
+  address: "{{contract_address}}",
   chainId: {{chainId}}
 );`,
     dotnet: `using Thirdweb;
@@ -272,7 +272,7 @@ export default function Component() {
 
 // Get your contract
 var contract = await ThirdwebManager.Instance.GetContract(
-  address: "{{contract_address}}", 
+  address: "{{contract_address}}",
   chainId: {{chainId}}
 );
 
@@ -1103,7 +1103,7 @@ function AccountFactorySection(props: {
           <AlertDescription>
             The recommended way to use account factories is to integrate the{" "}
             <UnderlineLink
-              href="https://portal.thirdweb.com/transactions/sponsor"
+              href="https://portal.thirdweb.com/wallets/sponsor-gas"
               rel="noopener noreferrer"
               target="_blank"
             >

apps/dashboard/src/@/components/contracts/contract-card/contract-card.tsx

@@ -178,7 +178,7 @@ export async function ContractCard({
           {auditLink && !isBeta && (
             <>
               <Link
-                className="relative z-1 flex items-center gap-1 font-medium text-sm text-success-text hover:underline"
+                className="relative z-10 flex items-center gap-1 font-medium text-sm text-success-text hover:underline"
                 href={auditLink}
                 rel="noopener noreferrer"
                 target="_blank"

apps/dashboard/src/@/components/contracts/import-contract/modal.tsx

@@ -1,11 +1,23 @@
 "use client";
 
 import { zodResolver } from "@hookform/resolvers/zod";
-import { ArrowDownToLineIcon, ExternalLinkIcon } from "lucide-react";
+import { UnderlineLink } from "@workspace/ui/components/UnderlineLink";
+import {
+  ArrowDownToLineIcon,
+  CircleAlertIcon,
+  ExternalLinkIcon,
+} from "lucide-react";
 import Link from "next/link";
+import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
-import { getAddress, isAddress, type ThirdwebClient } from "thirdweb";
+import {
+  getAddress,
+  getContract,
+  isAddress,
+  type ThirdwebClient,
+} from "thirdweb";
+import { defineChain } from "thirdweb/chains";
 import { useActiveWalletChain } from "thirdweb/react";
 import { z } from "zod";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
@@ -31,6 +43,11 @@ import { Spinner } from "@/components/ui/Spinner";
 import { useChainSlug } from "@/hooks/chains/chainSlug";
 import { useAddContractToProject } from "@/hooks/project-contracts";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { revalidateCacheTagAction } from "../../../actions/revalidate";
+import { projectContractsCacheTag } from "../../../api/project/cache-tag";
+import { resolveFunctionSelectors } from "../../../lib/selectors";
+import { supportedERCs } from "../../../utils/supportedERCs";
+import { Alert, AlertDescription, AlertTitle } from "../../ui/alert";
 
 type ImportModalProps = {
   isOpen: boolean;
@@ -42,6 +59,7 @@ type ImportModalProps = {
   client: ThirdwebClient;
   type: "contract" | "asset";
   onSuccess?: () => void;
+  allowedContractType: "token" | "non-token";
 };
 
 export const ImportModal: React.FC<ImportModalProps> = (props) => {
@@ -75,6 +93,7 @@ export const ImportModal: React.FC<ImportModalProps> = (props) => {
           teamId={props.teamId}
           teamSlug={props.teamSlug}
           type={props.type}
+          allowedContractType={props.allowedContractType}
         />
       </DialogContent>
     </Dialog>
@@ -105,6 +124,7 @@ function ImportForm(props: {
   client: ThirdwebClient;
   type: "contract" | "asset";
   onSuccess?: () => void;
+  allowedContractType: "token" | "non-token";
 }) {
   const router = useDashboardRouter();
   const activeChainId = useActiveWalletChain()?.id;
@@ -119,9 +139,14 @@ function ImportForm(props: {
   const chainSlug = useChainSlug(form.watch("chainId"));
   const addContractToProject = useAddContractToProject();
 
+  const [notAllowedError, setNotAllowedError] = useState(false);
+
   return (
     <Form {...form}>
       <form
+        onChange={() => {
+          setNotAllowedError(false);
+        }}
         onSubmit={form.handleSubmit(async (data) => {
           const { chainId } = data;
           let contractAddress: string;
@@ -158,6 +183,27 @@ function ImportForm(props: {
               return;
             }
 
+            // check if the contract matches the requirement
+            const contract = getContract({
+              address: contractAddress,
+              // eslint-disable-next-line no-restricted-syntax
+              chain: defineChain(chainId),
+              client: props.client,
+            });
+
+            const functionSelectors = await resolveFunctionSelectors(contract);
+            const ercs = supportedERCs(functionSelectors);
+
+            const isToken = ercs.isERC20 || ercs.isERC721 || ercs.isERC1155;
+
+            if (
+              (props.allowedContractType === "token" && !isToken) ||
+              (props.allowedContractType === "non-token" && isToken)
+            ) {
+              setNotAllowedError(true);
+              return;
+            }
+
             addContractToProject.mutate(
               {
                 chainId: chainId.toString(),
@@ -177,6 +223,12 @@ function ImportForm(props: {
                   }
                 },
                 onSuccess: () => {
+                  revalidateCacheTagAction(
+                    projectContractsCacheTag({
+                      teamId: props.teamId,
+                      projectId: props.projectId,
+                    }),
+                  );
                   router.refresh();
                   toast.success("Contract imported successfully");
                   props.onSuccess?.();
@@ -217,6 +269,34 @@ function ImportForm(props: {
           </div>
         </div>
 
+        {notAllowedError && (
+          <div className="px-6 pt-6 text-sm text-destructive-text">
+            <Alert variant="destructive">
+              <CircleAlertIcon className="size-5" />
+              <AlertTitle> Invalid Contract </AlertTitle>
+              <AlertDescription>
+                {props.allowedContractType === "token" && (
+                  <span>
+                    This contract is not a token contract. <br /> Only ERC20,
+                    ERC721 and ERC1155 contracts can be imported as tokens.
+                  </span>
+                )}
+                {props.allowedContractType === "non-token" && (
+                  <span>
+                    This contract is a token contract. <br /> Go to the{" "}
+                    <UnderlineLink
+                      href={`/team/${props.teamSlug}/${props.projectSlug}/tokens`}
+                    >
+                      Tokens
+                    </UnderlineLink>{" "}
+                    page to import in dashboard.
+                  </span>
+                )}
+              </AlertDescription>
+            </Alert>
+          </div>
+        )}
+
         <div className="mt-8 flex justify-end border-t bg-card p-6">
           {addContractToProject.isSuccess &&
           addContractToProject.data?.result ? (

apps/dashboard/src/@/components/in-app-wallet-users-content/user-wallets-table.tsx

@@ -64,7 +64,7 @@ const truncateIdentifier = (value: string) => {
   return `${value.slice(0, 8)}...${value.slice(-4)}`;
 };
 
-export function InAppWalletUsersPageContent(
+export function UserWalletsTable(
   props: {
     authToken: string;
     client: ThirdwebClient;
@@ -288,83 +288,81 @@ export function InAppWalletUsersPageContent(
   ]);
 
   return (
-    <div>
-      <div className="overflow-hidden rounded-xl border border-border bg-card">
-        <div className="flex flex-col lg:flex-row lg:justify-between p-4 lg:px-6 py-5 lg:items-center gap-5">
-          <div>
-            <div className="flex mb-3">
-              <div className="p-2 rounded-full bg-background border border-border">
-                <UserIcon className="size-5 text-muted-foreground" />
-              </div>
-            </div>
-            <h2 className="font-semibold text-2xl tracking-tight">
-              User Wallets
-            </h2>
-            <p className="text-muted-foreground text-sm">
-              View and manage your project's users
-            </p>
-          </div>
-
-          <div className="flex flex-col items-start lg:items-end gap-2.5 border-t lg:border-t-0 pt-5 lg:pt-0 border-dashed">
-            <div className="w-full lg:w-auto lg:min-w-[320px]">
-              <AdvancedSearchInput
-                onSearch={handleSearch}
-                onClear={handleClearSearch}
-                isLoading={isSearching}
-                hasResults={hasSearchResults}
-              />
-            </div>
-            <Button
-              className="gap-2 bg-background rounded-full"
-              disabled={wallets.length === 0 || isPending}
-              onClick={downloadCSV}
-              variant="outline"
-            >
-              {isPending && <Spinner className="size-4" />}
-              Download as .csv
-            </Button>
-          </div>
-        </div>
-
+    <div className="overflow-hidden rounded-xl border border-border bg-card">
+      <div className="flex flex-col lg:flex-row lg:justify-between p-4 lg:px-6 py-5 lg:items-center gap-5">
         <div>
-          {hasSearchResults ? (
-            <SearchResults results={searchResults} client={props.client} />
-          ) : (
-            <>
-              <TWTable
-                columns={columns}
-                data={wallets}
-                isFetched={walletsQuery.isFetched}
-                isPending={walletsQuery.isPending}
-                tableContainerClassName="rounded-none border-x-0 border-b-0"
-                title="in-app wallets"
-              />
-
-              <div className="flex justify-center gap-3 border-t bg-card p-6">
-                <Button
-                  className="gap-2 bg-background"
-                  disabled={activePage === 1 || walletsQuery.isPending}
-                  onClick={() => setActivePage((p) => Math.max(1, p - 1))}
-                  size="sm"
-                  variant="outline"
-                >
-                  <ArrowLeftIcon className="size-4" />
-                  Previous
-                </Button>
-                <Button
-                  className="gap-2 bg-background"
-                  disabled={wallets.length === 0 || walletsQuery.isPending}
-                  onClick={() => setActivePage((p) => p + 1)}
-                  size="sm"
-                  variant="outline"
-                >
-                  Next
-                  <ArrowRightIcon className="size-4" />
-                </Button>
-              </div>
-            </>
-          )}
+          <div className="flex mb-3">
+            <div className="p-2 rounded-full bg-background border border-border">
+              <UserIcon className="size-5 text-muted-foreground" />
+            </div>
+          </div>
+          <h2 className="font-semibold text-2xl tracking-tight">
+            User Wallets
+          </h2>
+          <p className="text-muted-foreground text-sm">
+            View and manage your project's users
+          </p>
         </div>
+
+        <div className="flex flex-col items-start lg:items-end gap-2.5 border-t lg:border-t-0 pt-5 lg:pt-0 border-dashed">
+          <div className="w-full lg:w-auto lg:min-w-[320px]">
+            <AdvancedSearchInput
+              onSearch={handleSearch}
+              onClear={handleClearSearch}
+              isLoading={isSearching}
+              hasResults={hasSearchResults}
+            />
+          </div>
+          <Button
+            className="gap-2 bg-background rounded-full"
+            disabled={wallets.length === 0 || isPending}
+            onClick={downloadCSV}
+            variant="outline"
+          >
+            {isPending && <Spinner className="size-4" />}
+            Download as .csv
+          </Button>
+        </div>
+      </div>
+
+      <div>
+        {hasSearchResults ? (
+          <SearchResults results={searchResults} client={props.client} />
+        ) : (
+          <>
+            <TWTable
+              columns={columns}
+              data={wallets}
+              isFetched={walletsQuery.isFetched}
+              isPending={walletsQuery.isPending}
+              tableContainerClassName="rounded-none border-x-0 border-b-0"
+              title="User wallets"
+            />
+
+            <div className="flex justify-center gap-3 border-t bg-card p-6">
+              <Button
+                className="gap-2 bg-background"
+                disabled={activePage === 1 || walletsQuery.isPending}
+                onClick={() => setActivePage((p) => Math.max(1, p - 1))}
+                size="sm"
+                variant="outline"
+              >
+                <ArrowLeftIcon className="size-4" />
+                Previous
+              </Button>
+              <Button
+                className="gap-2 bg-background"
+                disabled={wallets.length === 0 || walletsQuery.isPending}
+                onClick={() => setActivePage((p) => p + 1)}
+                size="sm"
+                variant="outline"
+              >
+                Next
+                <ArrowRightIcon className="size-4" />
+              </Button>
+            </div>
+          </>
+        )}
       </div>
     </div>
   );

apps/dashboard/src/@/components/misc/AnnouncementBanner.tsx

@@ -5,7 +5,6 @@ import Link from "next/link";
 import { Button } from "@/components/ui/button";
 import { useLocalStorage } from "@/hooks/useLocalStorage";
 
-// biome-ignore lint/correctness/noUnusedVariables: banner is toggled on-demand via API content changes
 function AnnouncementBannerUI(props: {
   href: string;
   label: string;
@@ -45,12 +44,11 @@ function AnnouncementBannerUI(props: {
 }
 
 export function AnnouncementBanner() {
-  // return (
-  //   <AnnouncementBannerUI
-  //     href="https://blog.thirdweb.com/the-fastest-way-to-build-web3-applications/"
-  //     label="We have re-branded our Engine, Payments, and Connect products. Please read the full blog post for details on changes"
-  //     trackingLabel="product-rebrand"
-  //   />
-  // );
-  return null;
+  return (
+    <AnnouncementBannerUI
+      href="https://blog.thirdweb.com/changelog/project-view-update-wallets/"
+      label="Transactions, Vault, and Account Abstraction are now part of Wallets in Project Dashboard. View changes"
+      trackingLabel="project-view-update-wallets"
+    />
+  );
 }

apps/dashboard/src/@/components/ui/link-with-copy-button.tsx

@@ -12,6 +12,7 @@ export function LinkWithCopyButton(props: {
   textToCopy: string;
   copyTooltip: string;
   className?: string;
+  linkIconClassName?: string;
 }) {
   const [isCopied, setIsCopied] = useState(false);
   const Icon = isCopied ? CheckIcon : CopyIcon;
@@ -37,8 +38,15 @@ export function LinkWithCopyButton(props: {
         target="_blank"
         className="text-sm text-muted-foreground hover:underline flex items-center gap-1 tabular-nums flex-1 truncate hover:text-foreground group"
       >
-        <span className="max-w-full truncate">{props.textToShow}</span>
-        <ArrowUpRightIcon className="size-3.5 opacity-70 shrink-0 group-hover:opacity-100" />
+        <span className="max-w-full truncate tabular-nums">
+          {props.textToShow}
+        </span>
+        <ArrowUpRightIcon
+          className={cn(
+            "size-3.5 opacity-70 shrink-0 group-hover:opacity-100",
+            props.linkIconClassName,
+          )}
+        />
       </Link>
     </div>
   );

apps/dashboard/src/@/constants/siwa-example-prompts.ts

@@ -1,5 +1,5 @@
 export const siwaExamplePrompts = [
-  "How do I add in-app wallet with sign in with google to my react app?",
+  "How do I add user wallet with sign in with google to my react app?",
   "How do I send a transaction in Unity?",
   "What does this contract revert error mean?",
   "I see thirdweb support id in my console log, can you help me?",

apps/dashboard/src/@/icons/ConnectSDKIcon.tsx

@@ -1,21 +0,0 @@
-export function ConnectSDKIcon(props: { className?: string }) {
-  return (
-    <svg
-      className={props.className}
-      fill="none"
-      height="24"
-      role="presentation"
-      viewBox="0 0 24 24"
-      width="24"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M16 8.00007V4.50073C16 3.66899 16 3.25312 15.8248 2.99755C15.6717 2.77425 15.4346 2.62257 15.1678 2.57715C14.8623 2.52517 14.4847 2.69944 13.7295 3.04799L4.85901 7.14206C4.18551 7.45291 3.84875 7.60834 3.60211 7.84939C3.38406 8.06249 3.21762 8.32262 3.1155 8.6099C3 8.93486 3 9.30575 3 10.0475V15.0001M16.5 14.5001H16.51M3 11.2001L3 17.8001C3 18.9202 3 19.4802 3.21799 19.9081C3.40973 20.2844 3.71569 20.5903 4.09202 20.7821C4.51984 21.0001 5.07989 21.0001 6.2 21.0001H17.8C18.9201 21.0001 19.4802 21.0001 19.908 20.7821C20.2843 20.5903 20.5903 20.2844 20.782 19.9081C21 19.4802 21 18.9202 21 17.8001V11.2001C21 10.08 21 9.51992 20.782 9.09209C20.5903 8.71577 20.2843 8.40981 19.908 8.21806C19.4802 8.00007 18.9201 8.00007 17.8 8.00007L6.2 8.00007C5.0799 8.00007 4.51984 8.00007 4.09202 8.21806C3.7157 8.40981 3.40973 8.71577 3.21799 9.09209C3 9.51991 3 10.08 3 11.2001ZM17 14.5001C17 14.7762 16.7761 15.0001 16.5 15.0001C16.2239 15.0001 16 14.7762 16 14.5001C16 14.2239 16.2239 14.0001 16.5 14.0001C16.7761 14.0001 17 14.2239 17 14.5001Z"
-        stroke="currentColor"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        strokeWidth="2"
-      />
-    </svg>
-  );
-}

apps/dashboard/src/@/icons/NebulaIcon.tsx

@@ -1,24 +0,0 @@
-export function NebulaIcon(props: { className?: string }) {
-  return (
-    <svg
-      className={props.className}
-      fill="none"
-      height="24"
-      role="presentation"
-      viewBox="0 0 153 153"
-      width="24"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M76.3162 90.8232C82.4613 90.8232 87.4429 85.8416 87.4429 79.6965C87.4429 73.5514 82.4613 68.5698 76.3162 68.5698C70.171 68.5698 65.1895 73.5514 65.1895 79.6965C65.1895 85.8416 70.171 90.8232 76.3162 90.8232Z"
-        fill="currentColor"
-      />
-      <path
-        clipRule="evenodd"
-        d="M91.9481 29.4892C78.7023 32.4916 63.6745 40.7425 50.4663 53.9508C46.781 57.636 43.4817 61.4629 40.5746 65.3532C44.5585 68.8492 47.0735 73.9786 47.0735 79.6955C47.0735 90.2299 38.5336 98.7698 27.9992 98.7698C27.1107 98.7698 26.2364 98.7091 25.3803 98.5915C23.3955 110.414 25.9579 119.384 31.3537 124.78C37.2202 130.646 47.3123 133.164 60.701 130.129C73.9468 127.126 88.9745 118.875 102.183 105.667C105.888 101.962 109.204 98.1131 112.122 94.2007C108.103 90.7037 105.562 85.551 105.562 79.8048C105.562 69.2704 114.102 60.7305 124.636 60.7305C125.536 60.7305 126.421 60.7928 127.288 60.9133C129.237 49.147 126.674 40.2167 121.295 34.8381C115.429 28.9716 105.337 26.4545 91.9481 29.4892ZM16.3791 94.8229C13.4047 109.493 15.9004 122.818 24.608 131.526C42.6147 149.532 80.3662 140.975 108.928 112.413C113.381 107.96 117.348 103.284 120.803 98.494C122.042 98.7466 123.324 98.8792 124.636 98.8792C135.171 98.8792 143.711 90.3393 143.711 79.8048C143.711 73.6582 140.803 68.1906 136.289 64.7023C139.234 50.0687 136.73 36.7817 128.041 28.0925C110.034 10.0859 72.2829 18.6429 43.7206 47.2051C39.2988 51.627 35.3564 56.2691 31.9179 61.024C30.6531 60.7599 29.3423 60.6211 27.9992 60.6211C17.4647 60.6211 8.9248 69.161 8.9248 79.6955C8.9248 85.8567 11.8461 91.3357 16.3791 94.8229ZM124.636 70.2677C119.369 70.2677 115.099 74.5376 115.099 79.8048C115.099 85.0721 119.369 89.342 124.636 89.342C129.904 89.342 134.174 85.0721 134.174 79.8048C134.174 74.5376 129.904 70.2677 124.636 70.2677ZM18.462 79.6955C18.462 74.4282 22.7319 70.1583 27.9992 70.1583C33.2664 70.1583 37.5363 74.4282 37.5363 79.6955C37.5363 84.9627 33.2664 89.2326 27.9992 89.2326C22.7319 89.2326 18.462 84.9627 18.462 79.6955Z"
-        fill="currentColor"
-        fillRule="evenodd"
-      />
-    </svg>
-  );
-}

apps/dashboard/src/@/icons/brand-icons/ExpoIcon.tsx

@@ -0,0 +1,21 @@
+export function ExpoIcon(props: { className?: string }) {
+  return (
+    <svg
+      width="800px"
+      height="800px"
+      viewBox="0 -12.5 256 256"
+      xmlns="http://www.w3.org/2000/svg"
+      xmlnsXlink="http://www.w3.org/1999/xlink"
+      preserveAspectRatio="xMidYMid"
+      className={props.className}
+      aria-hidden="true"
+    >
+      <g>
+        <path
+          d="M121.309004,84.6732585 C123.402504,81.5874152 125.694292,81.1950171 127.553451,81.1950171 C129.41261,81.1950171 132.509843,81.5874152 134.604162,84.6732585 C151.106348,107.339593 178.345607,152.492 198.439108,185.798721 C211.542532,207.519499 221.6069,224.201947 223.671721,226.324944 C231.422996,234.294992 242.053551,229.327949 248.230809,220.287799 C254.312201,211.387762 256.000111,205.138399 256.000111,198.471155 C256.000111,193.930186 167.895315,30.0714244 159.022317,16.4322117 C150.48936,3.31359639 147.710044,0 133.105527,0 L122.176721,0 C107.615631,0 105.511479,3.31359639 96.9777022,16.4322117 C88.1055238,30.0714244 0.0001105152,193.930186 0.0001105152,198.471155 C0.0001105152,205.138399 1.68839227,211.387762 7.76991495,220.287799 C13.9471241,229.327949 24.5775965,234.294992 32.3286259,226.324944 C34.3936934,224.201947 44.4580605,207.519499 57.5616485,185.798721 C77.654822,152.492 104.806818,107.339593 121.309004,84.6732585 Z"
+          fill="currentColor"
+        />
+      </g>
+    </svg>
+  );
+}

apps/dashboard/src/@/icons/brand-icons/NextjsIcon.tsx

@@ -0,0 +1,59 @@
+export function NextjsIcon(props: { className?: string }) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      data-testid="geist-icon"
+      strokeLinejoin="round"
+      style={{
+        color: "currentColor",
+      }}
+      viewBox="3 3 10 10"
+      aria-hidden="true"
+      className={props.className}
+    >
+      <g clipPath="url(#clip0_53_108)">
+        <path
+          d="M10.63 11V5"
+          stroke="url(#paint0_linear_53_108vsxrmxu21)"
+          strokeWidth={1.25}
+          strokeMiterlimit={Math.SQRT2}
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M5.995 5.00087V5H4.745V11H5.995V6.96798L12.3615 14.7076C12.712 14.4793 13.0434 14.2242 13.353 13.9453L5.99527 5.00065L5.995 5.00087Z"
+          fill="url(#paint1_linear_53_108vsxrmxu21)"
+        />
+      </g>
+      <defs>
+        <linearGradient
+          id="paint0_linear_53_108vsxrmxu21"
+          x1={11.13}
+          y1={5}
+          x2={11.13}
+          y2={11}
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="currentColor" />
+          <stop offset={0.609375} stopColor="currentColor" stopOpacity={0.57} />
+          <stop offset={0.796875} stopColor="currentColor" stopOpacity={0} />
+          <stop offset={1} stopColor="currentColor" stopOpacity={0} />
+        </linearGradient>
+        <linearGradient
+          id="paint1_linear_53_108vsxrmxu21"
+          x1={9.9375}
+          y1={9.0625}
+          x2={13.5574}
+          y2={13.3992}
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="currentColor" />
+          <stop offset={1} stopColor="currentColor" stopOpacity={0} />
+        </linearGradient>
+        <clipPath id="clip0_53_108">
+          <rect width={16} height={16} fill="red" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}

apps/dashboard/src/@/icons/brand-icons/NodeJSIcon.tsx

@@ -0,0 +1,20 @@
+export function NodeJSIcon(props: { className?: string }) {
+  return (
+    <svg
+      viewBox="0 0 32 32"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      aria-hidden="true"
+      className={props.className}
+    >
+      <path
+        d="M17.1725 2.29872C16.4627 1.89953 15.5373 1.90132 14.8269 2.29872C11.2689 4.26227 7.71082 6.22641 4.15216 8.18906C3.45969 8.55335 2.99264 9.29698 3.00009 10.0688V21.9328C2.99509 22.7197 3.48622 23.4705 4.19655 23.8298C5.21871 24.3736 6.2118 24.9726 7.25244 25.4802C8.45451 26.0709 9.95843 26.2015 11.1752 25.5855C12.1629 25.075 12.6016 23.9395 12.6003 22.896C12.6083 18.9806 12.6016 15.0651 12.6034 11.1496C12.6269 10.9756 12.4962 10.7896 12.3064 10.7938C11.8517 10.7866 11.3964 10.7896 10.9417 10.7926C10.7699 10.7764 10.6022 10.9191 10.6152 11.0918C10.6091 14.982 10.6164 18.8734 10.6115 22.7642C10.6214 23.3024 10.2578 23.8196 9.73913 24.0014C8.5412 24.4213 5.12198 22.2012 5.12198 22.2012C4.9965 22.1431 4.91682 22.007 4.92912 21.8718C4.92912 17.9576 4.92973 14.0433 4.92912 10.1297C4.91187 9.97191 5.00912 9.8298 5.15402 9.76538C8.70033 7.8134 12.2448 5.85654 15.7911 3.90336C15.9143 3.82115 16.086 3.8214 16.2089 3.90396C19.7552 5.85654 23.3003 7.81161 26.8472 9.76368C26.9926 9.828 27.0857 9.9725 27.0709 10.1297C27.0703 14.0433 27.0721 17.9576 27.0697 21.8713C27.0802 22.0098 27.0086 22.144 26.8793 22.2048C23.3661 24.1462 19.8129 26.025 16.3315 28.0228C16.1796 28.1099 16.0075 28.2086 15.8373 28.1126C14.9218 27.6062 14.0174 27.0801 13.1049 26.5688C13.0057 26.5069 12.8794 26.4803 12.7759 26.5496C12.3668 26.7652 11.982 26.9398 11.5122 27.1258C10.8524 27.387 10.9578 27.4938 11.5529 27.8405C12.62 28.4444 13.6889 29.0459 14.756 29.6504C15.4585 30.0888 16.4024 30.12 17.1275 29.7149C20.6861 27.7538 24.2436 25.7904 27.8029 23.8293C28.5113 23.468 29.0049 22.7202 28.9999 21.9327V10.0688C29.0068 9.31264 28.5576 8.58227 27.886 8.21259C24.3156 6.23947 20.7435 4.27064 17.1725 2.29872Z"
+        fill="currentColor"
+      />
+      <path
+        d="M22.5419 11.2062C21.1452 10.459 19.4836 10.4192 17.9315 10.5169C16.8102 10.6277 15.6309 10.9371 14.814 11.7409C13.9761 12.5489 13.7937 13.8537 14.1917 14.9085C14.4769 15.6539 15.1948 16.1386 15.9372 16.395C16.8935 16.7326 17.8979 16.837 18.9026 16.9414C19.819 17.0366 20.7357 17.1319 21.6165 17.4042C21.9763 17.5234 22.3953 17.7058 22.5055 18.0973C22.6073 18.5609 22.4957 19.0998 22.1193 19.4219C20.9237 20.3682 17.5979 20.2232 16.4166 19.4784C15.939 19.1611 15.7332 18.5994 15.6495 18.0641C15.6402 17.8973 15.5059 17.7443 15.3248 17.757C14.8713 17.7516 14.4178 17.7528 13.9643 17.7564C13.8061 17.7431 13.6416 17.8557 13.6329 18.0172C13.5397 20.4689 15.7914 21.5377 17.9039 21.773C19.1108 21.888 20.3442 21.8814 21.5327 21.6224C22.4261 21.419 23.3219 21.0444 23.9369 20.3563C24.6953 19.52 24.8444 18.2749 24.5043 17.2332C24.2443 16.4559 23.5012 15.9573 22.7416 15.7008C21.7086 15.3466 20.4844 15.1562 19.5488 15.0671C18.1889 14.9376 16.5729 14.9905 16.188 14.0969C16.0345 13.629 16.1651 13.048 16.5951 12.7602C17.7328 11.9885 20.0483 12.091 21.2265 12.6675C21.7675 12.9384 22.081 13.4948 22.2104 14.0565C22.2344 14.2215 22.3454 14.3937 22.5364 14.3865C22.9868 14.3955 23.4372 14.3889 23.8875 14.3895C24.0422 14.4003 24.2116 14.313 24.2418 14.1546C24.2227 12.9806 23.6232 11.7788 22.5419 11.2062Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}

apps/dashboard/src/@/icons/brand-icons/ViteIcon.tsx

@@ -0,0 +1,23 @@
+export function ViteIcon(props: { className?: string }) {
+  return (
+    <svg
+      viewBox="-0.5 0 257 257"
+      xmlns="http://www.w3.org/2000/svg"
+      xmlnsXlink="http://www.w3.org/1999/xlink"
+      preserveAspectRatio="xMidYMid"
+      aria-hidden="true"
+      className={props.className}
+    >
+      <g>
+        <path
+          d="M255.152904,37.937763 L134.896865,252.97646 C132.413943,257.416178 126.035075,257.442321 123.5149,253.02417 L0.87443175,37.9584812 C-1.87111536,33.1438084 2.24595371,27.3119153 7.70191187,28.2871109 L128.086639,49.8052023 C128.854587,49.9424525 129.640835,49.9411454 130.408783,49.8012155 L248.276014,28.3179595 C253.713738,27.3268821 257.850198,33.1136134 255.152904,37.937763 Z"
+          fill="currentColor"
+        />
+        <path
+          d="M185.432401,0.0631038902 L96.4393502,17.500942 C94.9766549,17.7875335 93.8936852,19.0270992 93.8054529,20.5146956 L88.3311293,112.971419 C88.2023755,115.149123 90.2023075,116.839261 92.3277254,116.349082 L117.10466,110.630976 C119.422882,110.096354 121.517582,112.138114 121.041128,114.469407 L113.67994,150.515893 C113.184532,152.941955 115.462232,155.016394 117.831433,154.29681 L133.134834,149.647295 C135.507302,148.927059 137.786963,151.00738 137.285019,153.435402 L125.586724,210.056351 C124.854723,213.598061 129.565674,215.529368 131.530313,212.49287 L132.842687,210.464834 L205.359174,65.745575 C206.573511,63.3224548 204.479465,60.5594769 201.818118,61.0730542 L176.31441,65.9952397 C173.91776,66.4573155 171.878614,64.2253653 172.555061,61.8805431 L189.2009,4.17570253 C189.878001,1.82692623 187.831665,-0.406957894 185.432401,0.0631038902 Z"
+          fill="hsl(var(--background))"
+        />
+      </g>
+    </svg>
+  );
+}

apps/dashboard/src/@/storybook/stubs.ts

@@ -30,6 +30,7 @@ export function teamStub(id: string, billingPlan: Team["billingPlan"]): Team {
     billingPlan: billingPlan,
     billingStatus: "validPayment",
     canCreatePublicChains: null,
+    isLegacyPlan: false,
     capabilities: {
       bundler: {
         enabled: true,
@@ -248,7 +249,7 @@ export function teamSubscriptionsStub(
           // In-App Wallets
           {
             amount: usage.inAppWalletAmount?.amount || 0,
-            description: `${usage.inAppWalletAmount?.quantity || 0} x In-App Wallets (Tier 1 at $0.00 / month)`,
+            description: `${usage.inAppWalletAmount?.quantity || 0} x User Wallets (Tier 1 at $0.00 / month)`,
             thirdwebSku: "usage:in_app_wallet",
           },
           // AA Sponsorship

apps/dashboard/src/@/types/analytics.ts

@@ -7,6 +7,10 @@ export interface WalletStats {
   walletType: string;
 }
 
+export type WalletStatsWithName = WalletStats & {
+  walletName: string;
+};
+
 export interface InAppWalletStats {
   date: string;
   authenticationMethod: string;
@@ -23,6 +27,8 @@ export interface UserOpStats {
   successful: number;
   failed: number;
   sponsoredUsd: number;
+  gasUnits: number;
+  avgGasPrice: number;
   chainId?: string;
 }
 
@@ -33,13 +39,6 @@ export interface TransactionStats {
   count: number;
 }
 
-export interface EngineCloudStats {
-  date: string;
-  chainId: string;
-  pathname: string;
-  totalRequests: number;
-}
-
 export interface UniversalBridgeStats {
   date: string;
   chainId: number;
@@ -94,3 +93,62 @@ export interface AnalyticsQueryParams {
   period?: "day" | "week" | "month" | "year" | "all";
   limit?: number;
 }
+
+export interface X402SettlementsOverall {
+  date: string;
+  totalRequests: number;
+  totalValue: number;
+  totalValueUSD: number;
+}
+
+export interface X402SettlementsByChainId {
+  date: string;
+  chainId: string;
+  totalRequests: number;
+  totalValue: number;
+  totalValueUSD: number;
+}
+
+export interface X402SettlementsByPayer {
+  date: string;
+  payer: string;
+  totalRequests: number;
+  totalValue: number;
+  totalValueUSD: number;
+}
+
+interface X402SettlementsByReceiver {
+  date: string;
+  receiver: string;
+  totalRequests: number;
+  totalValue: number;
+  totalValueUSD: number;
+}
+
+export interface X402SettlementsByResource {
+  date: string;
+  resource: string;
+  totalRequests: number;
+  totalValue: number;
+  totalValueUSD: number;
+}
+
+interface X402SettlementsByAsset {
+  date: string;
+  asset: string;
+  totalRequests: number;
+  totalValue: number;
+  totalValueUSD: number;
+}
+
+export type X402SettlementStats =
+  | X402SettlementsOverall
+  | X402SettlementsByChainId
+  | X402SettlementsByPayer
+  | X402SettlementsByReceiver
+  | X402SettlementsByResource
+  | X402SettlementsByAsset;
+
+export interface X402QueryParams extends AnalyticsQueryParams {
+  groupBy?: "overall" | "chainId" | "payer" | "resource" | "asset" | "receiver";
+}

apps/dashboard/src/@/utils/number.ts

@@ -1,6 +1,6 @@
 const usdCurrencyFormatter = new Intl.NumberFormat("en-US", {
   currency: "USD",
-  maximumFractionDigits: 2, // prefix with $
+  maximumFractionDigits: 6, // prefix with $
   minimumFractionDigits: 0, // don't show decimal places if value is a whole number
   notation: "compact", // at max 2 decimal places
   roundingMode: "halfEven", // round to nearest even number, standard practice for financial calculations

apps/dashboard/src/@/utils/pricing.tsx

@@ -23,7 +23,7 @@ export const TEAM_PLANS: Record<
     features: [
       "Email Support",
       "48hr Guaranteed Response",
-      "Custom In-App Wallet Auth",
+      "Custom User Wallet Auth",
     ],
     price: 99,
     subTitle: "Everything in Starter, plus:",

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/client/FaucetButton.tsx

@@ -3,6 +3,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import { Turnstile } from "@marsidev/react-turnstile";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import type { CanClaimResponseType } from "app/(app)/api/testnet-faucet/can-claim/CanClaimResponseType";
+import { ArrowUpRightIcon } from "lucide-react";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import { useForm } from "react-hook-form";
@@ -192,6 +193,20 @@ export function FaucetButton({
 
   // Can not claim
   if (canClaimFaucetQuery.data && canClaimFaucetQuery.data.canClaim === false) {
+    if (canClaimFaucetQuery.data.type === "paid-plan-required") {
+      return (
+        <Button
+          asChild
+          className="w-full gap-2 whitespace-pre-wrap h-auto min-h-10 text-center bg-background"
+          variant="outline"
+        >
+          <Link href="/team/~/~/billing">
+            Faucet is not available on Free plan. Upgrade your plan to continue
+            <ArrowUpRightIcon className="size-4 shrink-0 text-muted-foreground" />
+          </Link>
+        </Button>
+      );
+    }
     return (
       <Button className="!opacity-100 w-full " disabled variant="outline">
         {canClaimFaucetQuery.data.type === "throttle" && (
@@ -203,10 +218,6 @@ export function FaucetButton({
 
         {canClaimFaucetQuery.data.type === "unsupported-chain" &&
           "Faucet is empty right now"}
-
-        {/* TODO: add an upsell path here to subscribe to one of these plans */}
-        {canClaimFaucetQuery.data.type === "paid-plan-required" &&
-          "Faucet is only available on Starter, Growth, Scale and Pro plans."}
       </Button>
     );
   }

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/components/server/SupportedProductsSection.tsx

@@ -1,55 +1,112 @@
+import { BotIcon, CodeIcon, CoinsIcon } from "lucide-react";
 import Link from "next/link";
-import type { ChainMetadataWithServices } from "@/types/chain";
-import { products } from "../../../../components/server/products";
+import { useMemo } from "react";
+import { BridgeIcon } from "@/icons/BridgeIcon";
+import { PayIcon } from "@/icons/PayIcon";
+import { WalletProductIcon } from "@/icons/WalletProductIcon";
+import type {
+  ChainMetadataWithServices,
+  ChainSupportedService,
+} from "@/types/chain";
 import { SectionTitle } from "./SectionTitle";
 
 export function SupportedProductsSection(props: {
   services: ChainMetadataWithServices["services"];
 }) {
-  const enabledProducts = products.filter((product) => {
-    return props.services.find(
-      (service) => service.service === product.id && service.enabled,
+  const enabledServices = useMemo(() => {
+    return props.services.reduce(
+      (acc, service) => {
+        acc[service.service] = service.enabled;
+        return acc;
+      },
+      {} as Record<ChainSupportedService, boolean>,
     );
-  });
-
-  if (enabledProducts.length === 0) {
-    return null;
-  }
+  }, [props.services]);
 
   return (
     <section>
       <SectionTitle title="thirdweb Products" />
       <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3">
-        {enabledProducts.map((product) => {
-          return (
-            <div
-              className="relative rounded-xl border bg-card p-4 hover:border-active-border"
-              key={product.id}
-            >
-              <div className="flex mb-4">
-                <div className="p-2 rounded-full border bg-background">
-                  <product.icon className="size-4 text-muted-foreground" />
-                </div>
-              </div>
-              <div>
-                <h3 className="mb-1">
-                  <Link
-                    className="before:absolute before:inset-0 text-base font-medium"
-                    href={product.link}
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    {product.name}
-                  </Link>
-                </h3>
-                <p className="text-muted-foreground text-sm">
-                  {product.description}
-                </p>
-              </div>
-            </div>
-          );
-        })}
+        {enabledServices["connect-sdk"] && (
+          <ProductCard
+            icon={WalletProductIcon}
+            name="Wallets"
+            description="Create wallets to read and transact"
+            link="https://thirdweb.com/wallets"
+          />
+        )}
+
+        {enabledServices["account-abstraction"] && (
+          <ProductCard
+            icon={PayIcon}
+            name="x402"
+            description="Create internet native payments with x402"
+            link="https://thirdweb.com/x402"
+          />
+        )}
+
+        {enabledServices.pay && (
+          <ProductCard
+            icon={BridgeIcon}
+            name="Bridge"
+            description="Bridge and swap tokens across chains"
+            link="https://thirdweb.com/monetize/bridge"
+          />
+        )}
+
+        {enabledServices.contracts && (
+          <ProductCard
+            icon={CoinsIcon}
+            name="Tokens"
+            description="Launch tokens and markets"
+            link="https://thirdweb.com/token"
+          />
+        )}
+
+        <ProductCard
+          icon={BotIcon}
+          name="AI"
+          description="Read and write onchain via natural language"
+          link="https://thirdweb.com/ai"
+        />
+
+        <ProductCard
+          icon={CodeIcon}
+          name="HTTP API"
+          description="Build products with our HTTP API"
+          link="https://portal.thirdweb.com/reference"
+        />
       </div>
     </section>
   );
 }
+
+function ProductCard(props: {
+  icon: React.FC<{ className?: string }>;
+  link: string;
+  name: string;
+  description: string;
+}) {
+  return (
+    <div className="relative rounded-xl border bg-card p-4 hover:border-active-border">
+      <div className="flex mb-4">
+        <div className="p-2 rounded-full border bg-background">
+          <props.icon className="size-4 text-muted-foreground" />
+        </div>
+      </div>
+      <div>
+        <h3 className="mb-1">
+          <Link
+            className="before:absolute before:inset-0 text-base font-medium"
+            href={props.link}
+            rel="noopener noreferrer"
+            target="_blank"
+          >
+            {props.name}
+          </Link>
+        </h3>
+        <p className="text-muted-foreground text-sm">{props.description}</p>
+      </div>
+    </div>
+  );
+}

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getContractPageMetadataSetup.ts

@@ -2,6 +2,7 @@ import type { ThirdwebContract } from "thirdweb";
 import { contractType as getContractType } from "thirdweb/extensions/thirdweb";
 import { getDeployedEntrypointERC20 } from "thirdweb/tokens";
 import { resolveFunctionSelectors } from "@/lib/selectors";
+import { supportedERCs } from "@/utils/supportedERCs";
 import { getValidReward } from "../../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/rewards/utils/rewards";
 import {
   isERC20ClaimConditionsSupported,
@@ -21,7 +22,6 @@ import {
   isPermissionsEnumerableSupported,
   isPermissionsSupported,
 } from "./detectedFeatures/permissions";
-import { supportedERCs } from "./detectedFeatures/supportedERCs";
 import { type EmbedTypeToShow, getEmbedTypeToShow } from "./getEmbedTypeToShow";
 
 type ContractPageMetadata = {

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/getEmbedTypeToShow.ts

@@ -1,9 +1,9 @@
+import { supportedERCs } from "@/utils/supportedERCs";
 import { isClaimConditionsSupported } from "./detectedFeatures/claimConditions";
 import {
   isDirectListingSupported,
   isEnglishAuctionSupported,
 } from "./detectedFeatures/marketplace";
-import { supportedERCs } from "./detectedFeatures/supportedERCs";
 
 export type EmbedTypeToShow =
   | "marketplace-v3"

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_utils/newPublicPage.ts

@@ -2,7 +2,7 @@ import type { ThirdwebContract } from "thirdweb";
 import { isGetNFTsSupported as ERC721_isGetNFTsSupported } from "thirdweb/extensions/erc721";
 import { isGetNFTsSupported as ERC1155_isGetNFTsSupported } from "thirdweb/extensions/erc1155";
 import { resolveFunctionSelectors } from "@/lib/selectors";
-import { supportedERCs } from "./detectedFeatures/supportedERCs";
+import { supportedERCs } from "@/utils/supportedERCs";
 
 export type NewPublicPageType = "erc20" | "erc1155" | "erc721";
 

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/accounts/AccountsPage.tsx

@@ -22,7 +22,7 @@ export function AccountsPage(props: {
             View list of smart accounts that have been created for this
             contract.{" "}
             <UnderlineLink
-              href="https://portal.thirdweb.com/transactions/sponsor"
+              href="https://portal.thirdweb.com/wallets/sponsor-gas"
               target="_blank"
               rel="noopener noreferrer"
             >

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/ModuleForm.tsx

@@ -225,6 +225,10 @@ export const InstallModuleForm = (props: InstallModuleFormProps) => {
         moduleInfo: {
           bytecodeUri: selectedModule.metadata.bytecodeUri,
         },
+        isStylus:
+          (selectedModule.metadata.compilers?.stylus &&
+            selectedModule.metadata.compilers?.stylus?.length > 0) ||
+          false,
       });
     },
     queryKey: [
@@ -432,6 +436,7 @@ async function isModuleCompatible(options: {
   moduleInfo: {
     bytecodeUri: string;
   };
+  isStylus: boolean;
   client: ThirdwebClient;
 }) {
   // 1. get module's bytecode
@@ -444,15 +449,17 @@ async function isModuleCompatible(options: {
 
   // 2. check compatibility with core and installed modules
   try {
-    const isCompatible = await checkModulesCompatibility({
-      chain: options.contractInfo.chain,
-      client: options.client,
-      coreBytecode: options.contractInfo.bytecode,
-      moduleBytecodes: [
-        moduleBytecode,
-        ...options.contractInfo.installedModuleBytecodes,
-      ],
-    });
+    const isCompatible =
+      options.isStylus ||
+      (await checkModulesCompatibility({
+        chain: options.contractInfo.chain,
+        client: options.client,
+        coreBytecode: options.contractInfo.bytecode,
+        moduleBytecodes: [
+          moduleBytecode,
+          ...options.contractInfo.installedModuleBytecodes,
+        ],
+      }));
 
     return isCompatible;
   } catch (e) {

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/shared-layout.tsx

@@ -7,6 +7,7 @@ import { getTeams } from "@/api/team/get-team";
 import type { MinimalTeamsAndProjects } from "@/components/contracts/import-contract/types";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { resolveFunctionSelectors } from "@/lib/selectors";
+import { supportedERCs } from "@/utils/supportedERCs";
 import { shortenIfAddress } from "@/utils/usedapp-external";
 import type { ProjectMeta } from "../../../../team/[team_slug]/[project_slug]/contract/[chainIdOrSlug]/[contractAddress]/types";
 import { TeamHeader } from "../../../../team/components/TeamHeader/team-header";
@@ -14,7 +15,6 @@ import { ConfigureCustomChain } from "./_layout/ConfigureCustomChain";
 import { getContractMetadataHeaderData } from "./_layout/contract-metadata";
 import { ContractPageLayout } from "./_layout/contract-page-layout";
 import { ContractPageLayoutClient } from "./_layout/contract-page-layout.client";
-import { supportedERCs } from "./_utils/detectedFeatures/supportedERCs";
 import { getContractPageParamsInfo } from "./_utils/getContractFromParams";
 import { getContractPageMetadata } from "./_utils/getContractPageMetadata";
 import { getContractPageSidebarLinks } from "./_utils/getContractPageSidebarLinks";

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/[txHash]/bridge-status.tsx

@@ -10,7 +10,11 @@ import {
   CircleXIcon,
 } from "lucide-react";
 import Link from "next/link";
-import { NATIVE_TOKEN_ADDRESS, type ThirdwebClient } from "thirdweb";
+import {
+  getAddress,
+  NATIVE_TOKEN_ADDRESS,
+  type ThirdwebClient,
+} from "thirdweb";
 import type { Status, Token } from "thirdweb/bridge";
 import { status } from "thirdweb/bridge";
 import { toTokens } from "thirdweb/utils";
@@ -123,6 +127,8 @@ function TokenInfo(props: {
   const isNativeToken =
     props.token.address.toLowerCase() === NATIVE_TOKEN_ADDRESS.toLowerCase();
 
+  const tokenAddress = getAddress(props.token.address);
+
   return (
     <div className="flex-1 pt-10 pb-9 px-6 lg:px-8">
       <div className="flex justify-between items-center">
@@ -206,7 +212,7 @@ function TokenInfo(props: {
         <div className="space-y-1">
           <p className="text-sm text-foreground ">{props.addressLabel}</p>
           <WalletAddress
-            address={props.walletAddress}
+            address={getAddress(props.walletAddress)}
             client={props.client}
             className="py-0.5 h-auto text-sm [&>*]:!font-sans tabular-nums [&>*]:font-normal text-muted-foreground hover:text-foreground"
             iconClassName="size-3"
@@ -222,8 +228,8 @@ function TokenInfo(props: {
                 ? `/${chainQuery.data?.slug || props.token.chainId}`
                 : `/${chainQuery.data?.slug || props.token.chainId}/${props.token.address}`
             }
-            textToShow={props.token.address}
-            textToCopy={props.token.address}
+            textToShow={tokenAddress}
+            textToCopy={tokenAddress}
             copyTooltip="Copy Token Address"
             className="-translate-x-1"
           />

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/tx/[txHash]/page.tsx

@@ -8,7 +8,7 @@ import {
   Clock4Icon,
   InfoIcon,
 } from "lucide-react";
-import { toTokens } from "thirdweb";
+import { getAddress, toTokens } from "thirdweb";
 import { status } from "thirdweb/bridge";
 import type { ChainMetadata } from "thirdweb/chains";
 import {
@@ -153,6 +153,9 @@ function GeneericTxDetails(props: {
 
   const timestamp = getDatefromTimestamp(block.timestamp);
 
+  const fromAddress = getAddress(transaction.from);
+  const toAddress = transaction.to ? getAddress(transaction.to) : undefined;
+
   return (
     <div className="border  rounded-xl p-4 lg:p-6 bg-card">
       {/* section 1 */}
@@ -216,8 +219,8 @@ function GeneericTxDetails(props: {
       <section className="border-b py-6 space-y-5 lg:space-y-3">
         <GridItem label="From" tooltip="The sending party of the transaction.">
           <CopyTextButton
-            textToCopy={transaction.from}
-            textToShow={transaction.from}
+            textToCopy={fromAddress}
+            textToShow={fromAddress}
             tooltip="Copy from address"
             variant="ghost"
             copyIconPosition="right"
@@ -225,14 +228,14 @@ function GeneericTxDetails(props: {
           />
         </GridItem>
 
-        {transaction.to && (
+        {toAddress && (
           <GridItem
             label="Interacted with (To)"
             tooltip="The receiving party of the transaction (could be a contract address)."
           >
             <CopyTextButton
-              textToCopy={transaction.to}
-              textToShow={transaction.to}
+              textToCopy={toAddress}
+              textToShow={toAddress}
               tooltip="Copy to address"
               variant="ghost"
               copyIconPosition="right"

apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/client/filters.tsx

@@ -15,7 +15,7 @@ import {
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { Separator } from "@/components/ui/separator";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { products } from "../../../components/server/products";
+import { services } from "../../../components/server/products";
 
 function cleanUrl(url: string) {
   if (url.endsWith("?")) {
@@ -345,7 +345,7 @@ export const ChainServiceFilter: React.FC<ChainServiceFilterProps> = ({
 
   const section = (
     <FilterSection title="Services">
-      {products.map((product) => (
+      {services.map((product) => (
         <div className="group flex items-center gap-2" key={product.id}>
           <Checkbox
             checked={isServiceActive(mutableSearchParams, product.id)}
@@ -393,7 +393,7 @@ export const ChainServiceFilter: React.FC<ChainServiceFilterProps> = ({
     }
 
     const firstFilter = allFilters[0];
-    const name = products.find((p) => p.id === firstFilter)?.name;
+    const name = services.find((p) => p.id === firstFilter)?.name;
     const plus = allFilters.length > 1 ? ` +${allFilters.length - 1}` : "";
 
     return [`${name}${plus}`, true];

apps/dashboard/src/app/(app)/(dashboard)/(chain)/chainlist/components/server/chainlist-row.tsx

@@ -12,7 +12,7 @@ import { ToolTipLabel } from "@/components/ui/tooltip";
 import { cn } from "@/lib/utils";
 import type { ChainSupportedService } from "@/types/chain";
 import { ChainIcon } from "../../../components/server/chain-icon";
-import { products } from "../../../components/server/products";
+import { services } from "../../../components/server/products";
 import { getCustomChainMetadata } from "../../../utils";
 
 type ChainListRowProps = {
@@ -83,7 +83,7 @@ export function ChainListRow({
       <TableCell>
         <div className="flex w-[520px] flex-row items-center gap-14 ">
           <div className="z-10 flex items-center gap-4">
-            {products.map((p) => {
+            {services.map((p) => {
               return (
                 <ProductIcon
                   href={p.link}

apps/dashboard/src/app/(app)/(dashboard)/(chain)/components/server/products.ts

@@ -1,74 +1,69 @@
-import { ConnectSDKIcon } from "@/icons/ConnectSDKIcon";
-import { ContractIcon } from "@/icons/ContractIcon";
-import { EngineIcon } from "@/icons/EngineIcon";
+import { BotIcon, CoinsIcon, FuelIcon, HardDriveIcon } from "lucide-react";
+import { BridgeIcon } from "@/icons/BridgeIcon";
 import { InsightIcon } from "@/icons/InsightIcon";
-import { NebulaIcon } from "@/icons/NebulaIcon";
 import { PayIcon } from "@/icons/PayIcon";
 import { RPCIcon } from "@/icons/RPCIcon";
-import { SmartAccountIcon } from "@/icons/SmartAccountIcon";
+import { WalletProductIcon } from "@/icons/WalletProductIcon";
 import type { ChainSupportedService } from "@/types/chain";
 
-export const products = [
+export const services = [
   {
-    description: "Create, deploy and manage smart contracts",
-    icon: ContractIcon,
+    icon: CoinsIcon,
     id: "contracts",
-    link: "https://thirdweb.com/explore",
-    name: "Contracts",
+    link: "https://thirdweb.com/token",
+    name: "Tokens",
   },
   {
-    description: "Create and manage crypto wallets",
-    icon: ConnectSDKIcon,
+    icon: WalletProductIcon,
     id: "connect-sdk",
-    link: "https://thirdweb.com/connect",
-    name: "Wallets",
+    link: "https://thirdweb.com/wallets",
+    name: "User Wallets",
   },
   {
-    description: "Performant and scalable RPC service",
     icon: RPCIcon,
     id: "rpc-edge",
-    link: "https://portal.thirdweb.com/infrastructure/rpc-edge/overview",
-    name: "RPC Edge",
+    link: "https://thirdweb.com/rpc",
+    name: "RPC",
   },
   {
-    description: "Backend server that reads, writes, and deploys contracts",
-    icon: EngineIcon,
+    icon: HardDriveIcon,
     id: "engine",
-    link: "https://thirdweb.com/engine",
-    name: "Transactions",
+    link: "https://thirdweb.com/wallets",
+    name: "Server Wallets",
   },
   {
-    description: "Enable gas sponsorship for seamless transactions",
-    icon: SmartAccountIcon,
+    icon: FuelIcon,
     id: "account-abstraction",
-    link: "https://portal.thirdweb.com/wallets/sponsor-gas",
-    name: "Account Abstraction",
+    link: "https://thirdweb.com/wallets",
+    name: "Gas Sponsorship",
   },
   {
-    description: "Enable payments in any token on any chain",
-    icon: PayIcon,
+    icon: BridgeIcon,
     id: "pay",
-    link: "https://portal.thirdweb.com/payments",
-    name: "Payments",
+    link: "https://thirdweb.com/monetize/bridge",
+    name: "Bridge",
   },
   {
-    description: "Query and analyze blockchain data",
-    icon: InsightIcon,
-    id: "insight",
-    link: "https://thirdweb.com/insight",
-    name: "Insight",
-  },
-  {
-    description: "The most powerful AI for interacting with the blockchain",
-    icon: NebulaIcon,
+    icon: BotIcon,
     id: "nebula",
     link: "https://thirdweb.com/ai",
-    name: "thirdweb AI",
+    name: "AI",
+  },
+  {
+    icon: PayIcon,
+    id: "account-abstraction",
+    link: "https://thirdweb.com/x402",
+    name: "x402",
+  },
+  {
+    icon: InsightIcon,
+    id: "insight",
+    link: "https://thirdweb.com/gateway",
+    name: "Indexer",
   },
 ] satisfies Array<{
   name: string;
   id: ChainSupportedService;
   icon: React.FC<{ className?: string }>;
-  description: string;
   link: string;
 }>;

apps/dashboard/src/app/(app)/(dashboard)/explore/[category]/page.tsx

@@ -1,130 +0,0 @@
-import type { Metadata } from "next";
-import Link from "next/link";
-import { notFound } from "next/navigation";
-import { Suspense } from "react";
-import {
-  ContractCard,
-  ContractCardSkeleton,
-} from "@/components/contracts/contract-card/contract-card";
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbLink,
-  BreadcrumbList,
-  BreadcrumbPage,
-  BreadcrumbSeparator,
-} from "@/components/ui/breadcrumb";
-import { DeployUpsellCard } from "../components/upsells/deploy-your-own";
-import { getCategory } from "../data";
-
-type ExploreCategoryPageProps = {
-  params: Promise<{
-    category: string;
-  }>;
-};
-
-export async function generateMetadata(
-  props: ExploreCategoryPageProps,
-): Promise<Metadata> {
-  const params = await props.params;
-  const category = getCategory(params.category);
-  if (!category) {
-    notFound();
-  }
-  return {
-    description: `${category.description} Deploy with one click to Ethereum, Polygon, Optimism, and other EVM blockchains with thirdweb.`,
-    title: `${category.name} Smart Contracts | Explore`,
-  };
-}
-
-export default async function ExploreCategoryPage(
-  props: ExploreCategoryPageProps,
-) {
-  const params = await props.params;
-  const category = getCategory(params.category);
-  if (!category) {
-    notFound();
-  }
-
-  return (
-    <div className="flex flex-col">
-      <Breadcrumb className="border-border border-b px-6 py-4">
-        <BreadcrumbList>
-          <BreadcrumbItem>
-            <BreadcrumbLink asChild>
-              <Link href="/explore">Explore</Link>
-            </BreadcrumbLink>
-          </BreadcrumbItem>
-          <BreadcrumbSeparator />
-          <BreadcrumbItem>
-            <BreadcrumbPage>
-              {category.displayName || category.name}
-            </BreadcrumbPage>
-          </BreadcrumbItem>
-        </BreadcrumbList>
-      </Breadcrumb>
-      <div className="container flex flex-col gap-4 py-8">
-        <h1 className="mb-3 font-bold text-3xl tracking-tighter lg:text-5xl">
-          {category.displayName || category.name}
-        </h1>
-        <p className="max-w-screen-md text-base text-muted-foreground lg:text-lg">
-          {category.description}{" "}
-          {category.learnMore && (
-            <Link href={category.learnMore}>Learn more</Link>
-          )}
-        </p>
-        <div className="h-10" />
-        <div className="grid grid-cols-1 gap-5 md:grid-cols-3">
-          {category.contracts.map((publishedContractId) => {
-            const publisher: string | undefined = Array.isArray(
-              publishedContractId,
-            )
-              ? publishedContractId[0].split("/")[0]
-              : publishedContractId.split("/")[0];
-            const contractId: string | undefined = Array.isArray(
-              publishedContractId,
-            )
-              ? publishedContractId[0].split("/")[1]
-              : publishedContractId.split("/")[1];
-            const modules = Array.isArray(publishedContractId)
-              ? publishedContractId[1]
-              : undefined;
-            const overrides = Array.isArray(publishedContractId)
-              ? publishedContractId[2]
-              : undefined;
-
-            if (!publisher || !contractId) {
-              return null;
-            }
-
-            return (
-              <Suspense
-                fallback={<ContractCardSkeleton />}
-                key={publisher + contractId + overrides?.title}
-              >
-                <ContractCard
-                  contractId={contractId}
-                  descriptionOverride={overrides?.description}
-                  isBeta={category.isBeta}
-                  modules={
-                    modules?.length
-                      ? modules.map((m) => ({
-                          moduleId: m.split("/")[1] || "",
-                          publisher: m.split("/")[0] || "",
-                        }))
-                      : undefined
-                  }
-                  publisher={publisher}
-                  titleOverride={overrides?.title}
-                />
-              </Suspense>
-            );
-          })}
-        </div>
-
-        <div className="h-16" />
-        <DeployUpsellCard />
-      </div>
-    </div>
-  );
-}

apps/dashboard/src/app/(app)/(dashboard)/explore/components/contract-row/index.tsx

@@ -1,4 +1,3 @@
-import { ArrowRightIcon } from "lucide-react";
 import Link from "next/link";
 import { Suspense } from "react";
 import {
@@ -7,48 +6,45 @@ import {
 } from "@/components/contracts/contract-card/contract-card";
 import type { ExploreCategory } from "../../data";
 
-export function ContractRow({ category }: { category: ExploreCategory }) {
+export function ContractRow({
+  category,
+  prefixCard,
+}: {
+  category: ExploreCategory;
+  prefixCard?: React.ReactNode;
+}) {
   return (
     <section>
       {/* Title, Description + View all link */}
       <div className="flex items-center justify-between gap-4">
-        <header className="flex flex-col gap-1.5">
-          <Link href={`/explore/${category.id}`}>
-            <h2 className="font-semibold text-2xl tracking-tight">
-              {category.displayName || category.name}
-            </h2>
-          </Link>
+        <header className="flex flex-col gap-1">
+          <h2 className="font-semibold text-2xl tracking-tight">
+            {category.displayName || category.name}
+          </h2>
 
-          <p className="text-muted-foreground">
-            {category.description}{" "}
-            {category.learnMore && (
-              <Link
-                className="inline text-link-foreground"
-                href={category.learnMore}
-                rel="noopener noreferrer"
-                target="_blank"
-              >
-                Learn more
-              </Link>
-            )}
-          </p>
+          {(category.description || category.learnMore) && (
+            <p className="text-muted-foreground">
+              {category.description}{" "}
+              {category.learnMore && (
+                <Link
+                  className="inline text-link-foreground"
+                  href={category.learnMore}
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  Learn more
+                </Link>
+              )}
+            </p>
+          )}
         </header>
-
-        {category.contracts.length > 6 && (
-          <Link
-            className="flex shrink-0 items-center gap-1 text-base text-link-foreground hover:text-foreground"
-            href={`/explore/${category.id}`}
-          >
-            View all
-            <ArrowRightIcon className="size-4" />
-          </Link>
-        )}
       </div>
 
       <div className="h-5" />
 
       <div className="relative z-0 grid grid-cols-1 gap-4 md:grid-cols-3">
-        {category.contracts.slice(0, 6).map((publishedContractId) => {
+        {prefixCard}
+        {category.contracts.map((publishedContractId) => {
           const publisher: string | undefined = Array.isArray(
             publishedContractId,
           )

apps/dashboard/src/app/(app)/(dashboard)/explore/components/token-cards.tsx

@@ -0,0 +1,103 @@
+"use client";
+
+import { RocketIcon, ShieldCheckIcon } from "lucide-react";
+import Link from "next/link";
+import { reportTokenUpsellClicked } from "@/analytics/report";
+import { Img } from "@/components/blocks/Img";
+import { Button } from "@/components/ui/button";
+
+const thirdwebEns = {
+  name: "thirdweb.eth",
+  image: "https://euc.li/thirdweb.eth",
+};
+
+function TokenContractCard(props: {
+  name: string;
+  description: string;
+  link: string;
+  trackingType: "nft" | "coin";
+}) {
+  return (
+    <article className="relative flex min-h-[220px] flex-col rounded-lg border border-border bg-card p-4 hover:border-active-border">
+      <div className="flex items-center gap-1.5">
+        <div className="flex items-center gap-1 font-medium text-sm text-success-text">
+          <ShieldCheckIcon className="size-4" />
+          Audited
+        </div>
+      </div>
+
+      <div className="h-3.5" />
+
+      {/* Title */}
+      <h3 className="font-semibold text-lg tracking-tight">
+        <Link
+          className="cursor-pointer before:absolute before:inset-0 before:z-0"
+          href={props.link}
+          onClick={() => {
+            reportTokenUpsellClicked({
+              assetType: props.trackingType,
+              pageType: "explore",
+            });
+          }}
+        >
+          {props.name}
+        </Link>
+      </h3>
+
+      <p className="mt-1 text-muted-foreground text-sm leading-5">
+        {props.description}
+      </p>
+
+      <div className="mt-auto relative z-1 flex justify-between gap-2 pt-3">
+        <Link
+          className="flex shrink-0 items-center gap-1.5 hover:underline"
+          href={`/${thirdwebEns.name}`}
+          target="_blank"
+        >
+          <Img
+            className="size-5 rounded-full object-cover"
+            src={thirdwebEns.image}
+          />
+
+          <span className="text-xs"> {thirdwebEns.name}</span>
+        </Link>
+
+        <div className="flex items-center justify-between">
+          <Button
+            asChild
+            className="relative z-10 h-auto gap-1.5 px-2.5 py-1.5 text-xs hover:bg-inverted hover:text-inverted-foreground"
+            size="sm"
+            variant="outline"
+          >
+            <Link href={props.link}>
+              <RocketIcon className="size-3" />
+              Deploy
+            </Link>
+          </Button>
+        </div>
+      </div>
+    </article>
+  );
+}
+
+export function NFTCollectionCard() {
+  return (
+    <TokenContractCard
+      name="NFT Collection"
+      description="Launch an ERC-721 or ERC-1155 NFT collection"
+      link="/team/~/~project/tokens/create/nft"
+      trackingType="nft"
+    />
+  );
+}
+
+export function CoinCard() {
+  return (
+    <TokenContractCard
+      name="Coin"
+      description="Launch an ERC-20 token to create a cryptocurrency"
+      link="/team/~/~project/tokens/create/token"
+      trackingType="coin"
+    />
+  );
+}

apps/dashboard/src/app/(app)/(dashboard)/explore/components/upsells/deploy-your-own.tsx

@@ -5,31 +5,12 @@ import { PlainTextCodeBlock } from "@/components/ui/code/plaintext-code";
 export const DeployUpsellCard: React.FC = () => {
   return (
     <section className="rounded-xl border border-border px-4 py-6 shadow-lg md:px-8 md:py-14">
-      <h3 className="font-bold text-2xl tracking-tight">
+      <h3 className="font-semibold text-2xl tracking-tight">
         Didn't find what you're looking for? Build your own!
       </h3>
 
       <div className="h-8" />
 
-      <p className="text-muted-foreground ">
-        Create a contract with a single command.{" "}
-        <Link
-          className="inline-flex items-center gap-1.5 text-link-foreground"
-          href="https://portal.thirdweb.com/contracts/build/overview"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more about the Solidity SDK
-          <ExternalLinkIcon className="size-4" />
-        </Link>
-      </p>
-
-      <div className="h-2" />
-
-      <PlainTextCodeBlock code="npx thirdweb create contract" />
-
-      <div className="h-8" />
-
       <p className="text-muted-foreground ">
         Deploy a contract with a single command.{" "}
         <Link

apps/dashboard/src/app/(app)/(dashboard)/explore/components/upsells/publish-submit.tsx

@@ -1,70 +0,0 @@
-import Image from "next/image";
-import Link from "next/link";
-import { Button } from "@/components/ui/button";
-import exploreFeatureImage from "../../../../../../../public/assets/landingpage/explore-featured.png";
-import heroIcon1 from "../../../../../../../public/assets/product-pages/publish/hero-icon-1.png";
-import heroIcon2 from "../../../../../../../public/assets/product-pages/publish/hero-icon-2.png";
-
-export const PublishUpsellCard: React.FC = () => {
-  return (
-    <div className="flex gap-10 rounded-xl border border-border bg-card p-8 shadow-lg md:p-10">
-      <div className="flex flex-col gap-6">
-        <h2 className="font-bold text-3xl tracking-tighter">
-          Accelerate your protocol's growth
-        </h2>
-
-        <p className="text-muted-foreground">
-          Publishing your contract is the best way to get your contracts in
-          front of our 70k+ community of web3 developers.
-        </p>
-
-        <div className="flex gap-2">
-          <Image alt="" className="hidden size-6 md:block" src={heroIcon1} />
-
-          <p className="text-muted-foreground">
-            <span className="font-semibold text-foreground">
-              Save development time.{" "}
-            </span>
-            Focus on protocol development and save time by not having to build
-            middleware layer yourself.
-          </p>
-        </div>
-
-        <div className="flex gap-2">
-          <Image alt="" className="hidden size-6 md:block" src={heroIcon2} />
-          <p className="text-muted-foreground">
-            <span className="font-semibold text-foreground">
-              Shareable landing page.{" "}
-            </span>
-            By publishing your contract, your contracts become easily shareable
-            with a landing page for your contract.
-          </p>
-        </div>
-
-        <div className="mt-auto flex gap-2 pt-4">
-          <Button asChild>
-            <Link href="/contact-us" rel="noopener noreferrer" target="_blank">
-              Get In Touch
-            </Link>
-          </Button>
-
-          <Button asChild variant="outline">
-            <Link
-              href="https://portal.thirdweb.com/contracts/publish/overview"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              Learn More
-            </Link>
-          </Button>
-        </div>
-      </div>
-      <Image
-        alt=""
-        className="hidden w-[40%] grayscale invert md:block dark:filter-none"
-        draggable={false}
-        src={exploreFeatureImage}
-      />
-    </div>
-  );
-};

apps/dashboard/src/app/(app)/(dashboard)/explore/data.ts

@@ -1,151 +1,55 @@
 type PublishedContractID = `${string}/${string}`;
 
 export interface ExploreCategory {
-  id: string;
   name: string;
   displayName?: string;
-  description: string;
+  description: string | undefined;
   learnMore?: string;
-  contracts:
-    | Array<PublishedContractID>
-    | Array<
-        [
-          PublishedContractID,
-          Array<PublishedContractID>,
-          { title: string; description: string },
-        ]
-      >;
-  showInExplore?: boolean;
+  contracts: Array<
+    | PublishedContractID
+    | [
+        PublishedContractID,
+        Array<PublishedContractID>,
+        { title: string; description: string },
+      ]
+  >;
   isBeta?: boolean;
 }
 
-const POPULAR = {
+export const NFTS = {
   contracts: [
-    "thirdweb.eth/DropERC721",
-    "thirdweb.eth/MarketplaceV3",
-    "thirdweb.eth/AccountFactory",
-    "0xaF3202F6bAEbA50d37e0d4B0b870455EDF198D7c/BurnMintERC677",
-    "thirdweb.eth/DropERC1155",
-    "thirdweb.eth/TokenERC20",
-    "thirdweb.eth/NFTStake",
-    "unlock-protocol.eth/PublicLock",
-  ],
-  description: "A collection of our most deployed contracts.",
-  id: "popular",
-  name: "Popular",
-} satisfies ExploreCategory;
-
-const NFTS = {
-  contracts: [
-    "thirdweb.eth/DropERC721",
-    "thirdweb.eth/OpenEditionERC721",
-    "thirdweb.eth/TokenERC721",
-    "thirdweb.eth/DropERC1155",
-    "thirdweb.eth/TokenERC1155",
-    "flairsdk.eth/ERC721CommunityStream",
     "thirdweb.eth/LoyaltyCard",
     "doubledev.eth/ERC4907",
-    "thirdweb.eth/Multiwrap",
     "kronickatz.eth/ERC721NESDrop",
   ],
   description:
     "NFT Collections, Editions, Drops and everything else NFT-related.",
   displayName: "NFTs",
-  id: "nft",
   name: "NFT",
 } satisfies ExploreCategory;
 
-const GOVERNANCE = {
-  contracts: [
-    "thirdweb.eth/VoteERC20",
-    "thirdweb.eth/TokenERC20",
-    "thirdweb.eth/Split",
-  ],
+export const GOVERNANCE = {
+  contracts: ["thirdweb.eth/VoteERC20", "thirdweb.eth/Split"],
   description: "Create your own DAO, vote on proposals, and manage a treasury.",
-  id: "daos-governance",
   name: "DAOs & Governance",
 } satisfies ExploreCategory;
 
-const DROPS = {
-  contracts: [
-    "thirdweb.eth/DropERC721",
-    "thirdweb.eth/DropERC1155",
-    "thirdweb.eth/DropERC20",
-  ],
-  description: "Release NFTs and Tokens based on preset Claim Conditions.",
-  displayName: "Drops",
-  id: "drops",
-  name: "Drop",
-} satisfies ExploreCategory;
-
-const MARKETS = {
-  contracts: [
-    "thirdweb.eth/MarketplaceV3",
-    "thirdweb.eth/TokenERC20",
-    "thirdweb.eth/Split",
-  ],
+export const MARKETS = {
+  contracts: ["thirdweb.eth/MarketplaceV3", "thirdweb.eth/Split"],
   description: "Quickly spin up your own on-chain marketplace for NFTs.",
   displayName: "Marketplaces",
-  id: "marketplace",
   name: "Marketplace",
 } satisfies ExploreCategory;
 
-const AIRDROP = {
+export const AIRDROP = {
   contracts: ["thirdweb.eth/Airdrop"],
   description:
     "Efficiently transfer large numbers of on-chain assets to a large number of recipients.",
   displayName: "Airdrops",
-  id: "airdrop",
   name: "Airdrop",
 } satisfies ExploreCategory;
 
-const GAMING = {
-  contracts: [
-    "thirdweb.eth/MarketplaceV3",
-    "thirdweb.eth/DropERC721",
-    "thirdweb.eth/TokenERC20",
-    "thirdweb.eth/TokenERC1155",
-    "thirdweb.eth/Multiwrap",
-    "thirdweb.eth/NFTStake",
-  ],
-  description:
-    "A collection of contracts that are popular for building play-to-earn and free-to-own web3 games.",
-  displayName: "Gaming",
-  id: "gaming",
-  name: "Gaming",
-  showInExplore: false,
-} satisfies ExploreCategory;
-
-const LOYALTY = {
-  contracts: [
-    "thirdweb.eth/LoyaltyCard",
-    "thirdweb.eth/MarketplaceV3",
-    "thirdweb.eth/TokenERC20",
-  ],
-  description:
-    "A collection of contracts that are popular for building loyalty programs.",
-  displayName: "Loyalty",
-  id: "loyalty",
-  name: "Loyalty",
-  showInExplore: false,
-} satisfies ExploreCategory;
-
-const COMMERCE = {
-  contracts: [
-    "thirdweb.eth/TokenERC721",
-    "thirdweb.eth/TokenERC1155",
-    "thirdweb.eth/TokenERC20",
-    "thirdweb.eth/Split",
-  ],
-  description:
-    "Most popular contracts for building web3 commerce apps. Reward loyal customers and sell NFTs through your storefront.",
-  displayName: "Commerce",
-  id: "commerce",
-  name: "Commerce",
-  showInExplore: false,
-} satisfies ExploreCategory;
-
-const STAKING = {
+export const STAKING = {
   contracts: [
     "thirdweb.eth/NFTStake",
     "thirdweb.eth/EditionStake",
@@ -153,12 +57,10 @@ const STAKING = {
   ],
   description: "Stake your NFTs or tokens to earn ERC20 tokens in return.",
   displayName: "Staking",
-  id: "staking",
   name: "Staking",
-  showInExplore: true,
 } satisfies ExploreCategory;
 
-const SMART_WALLET = {
+export const SMART_WALLET = {
   contracts: [
     "thirdweb.eth/AccountFactory",
     "thirdweb.eth/ManagedAccountFactory",
@@ -168,56 +70,58 @@ const SMART_WALLET = {
   description:
     "Account factories that let you spin up Account Abstraction (ERC-4337) wallets for your users. Not sure which factory is right for you?",
   displayName: "Account Abstraction",
-  id: "smart-wallet",
   learnMore:
     "https://portal.thirdweb.com/wallets/smart-wallet/get-started#1-deploy-a-smart-wallet-factory-contract",
   name: "Account Abstraction",
-  showInExplore: true,
 } satisfies ExploreCategory;
 
-const STYLUS = {
+export const STYLUS = {
   contracts: [
     "0x6453a486d52e0EB6E79Ec4491038E2522a926936/StylusAirdropERC1155",
     "0x6453a486d52e0EB6E79Ec4491038E2522a926936/StylusAirdropERC721",
     "0x6453a486d52e0EB6E79Ec4491038E2522a926936/StylusAirdropERC20",
+    // erc721 token
+    [
+      "thirdweb.eth/ERC721CoreInitializable",
+      [
+        "0x6453a486d52e0eb6e79ec4491038e2522a926936/StylusMintableERC721",
+        "deployer.thirdweb.eth/BatchMetadataERC721",
+        "0x6453a486d52e0eb6e79ec4491038e2522a926936/StylusTransferableERC721",
+      ],
+      {
+        description: "ERC721 NFTs that only owners can mint.",
+        title: "Modular NFT Collection",
+      },
+    ],
+    // erc1155 token
+    [
+      "thirdweb.eth/ERC1155CoreInitializable",
+      [
+        "0x6453a486d52e0eb6e79ec4491038e2522a926936/StylusMintableERC1155",
+        "deployer.thirdweb.eth/BatchMetadataERC1155",
+        "0x6453a486d52e0eb6e79ec4491038e2522a926936/StylusTransferableERC1155",
+        "deployer.thirdweb.eth/SequentialTokenIdERC1155",
+      ],
+      {
+        description: "ERC1155 NFTs that only owners can mint.",
+        title: "Modular Edition",
+      },
+    ],
+    // erc20 token
+    [
+      "thirdweb.eth/ERC20CoreInitializable",
+      [
+        "0x6453a486d52e0eb6e79ec4491038e2522a926936/StylusMintableERC20",
+        "0x6453a486d52e0eb6e79ec4491038e2522a926936/StylusTransferableERC20",
+      ],
+      {
+        description: "ERC20 Tokens that only owners can mint.",
+        title: "Modular Token",
+      },
+    ],
   ],
-  description:
-    "Airdrop your NFTs or tokens to a large number of recipients. Built with Arbitrum Stylus.",
-  displayName: "Arbitrum Stylus Contracts",
-  id: "stylus",
+  description: undefined,
+  displayName: "Arbitrum Stylus",
   name: "Stylus",
-  showInExplore: true,
   isBeta: true,
 } satisfies ExploreCategory;
-
-const CATEGORIES: Record<string, ExploreCategory> = {
-  [POPULAR.id]: POPULAR,
-  [NFTS.id]: NFTS,
-  [MARKETS.id]: MARKETS,
-  [STYLUS.id]: STYLUS,
-  [DROPS.id]: DROPS,
-  [SMART_WALLET.id]: SMART_WALLET,
-  [AIRDROP.id]: AIRDROP,
-  [GAMING.id]: GAMING,
-  [LOYALTY.id]: LOYALTY,
-  [COMMERCE.id]: COMMERCE,
-  [STAKING.id]: STAKING,
-  [GOVERNANCE.id]: GOVERNANCE,
-};
-
-export function getCategory(id: string) {
-  if (isExploreCategory(id)) {
-    return CATEGORIES[id];
-  }
-  return null;
-}
-
-type ExploreCategoryName = keyof typeof CATEGORIES;
-
-function isExploreCategory(category: string): category is ExploreCategoryName {
-  return category in CATEGORIES;
-}
-
-export const EXPLORE_PAGE_DATA = Object.values(CATEGORIES).filter((v) =>
-  "showInExplore" in v ? v.showInExplore !== false : true,
-);

apps/dashboard/src/app/(app)/(dashboard)/explore/page.tsx

@@ -1,14 +1,20 @@
 import type { Metadata } from "next";
-import { Fragment } from "react";
 import { ContractRow } from "./components/contract-row";
+import { CoinCard, NFTCollectionCard } from "./components/token-cards";
 import { DeployUpsellCard } from "./components/upsells/deploy-your-own";
-import { PublishUpsellCard } from "./components/upsells/publish-submit";
-import { EXPLORE_PAGE_DATA } from "./data";
-import { TokensSection } from "./tokens-section";
+import {
+  AIRDROP,
+  GOVERNANCE,
+  MARKETS,
+  NFTS,
+  SMART_WALLET,
+  STAKING,
+  STYLUS,
+} from "./data";
 
 const title = "List of smart contracts for EVM Developers";
 const description =
-  "A list of Ethereum smart contract templates for web3 developers, including the most popular evm smart contracts for dapps, NFTs and more.";
+  "A list of smart contract templates for web3 developers, including the most popular evm smart contracts for dapps, NFTs and more.";
 
 export const metadata: Metadata = {
   description,
@@ -22,9 +28,9 @@ export const metadata: Metadata = {
 export default async function ExplorePage() {
   return (
     <div className="flex flex-col">
-      <div className="border-b py-10">
+      <div className="border-b py-12">
         <div className="container max-w-7xl">
-          <h1 className="mb-2 font-bold text-4xl lg:text-5xl tracking-tight">
+          <h1 className="mb-2 font-semibold text-4xl lg:text-5xl tracking-tight">
             Explore
           </h1>
           <p className="max-w-screen-sm text-sm lg:text-base text-muted-foreground">
@@ -35,24 +41,34 @@ export default async function ExplorePage() {
         </div>
       </div>
 
-      <div className="container max-w-7xl pt-8 pb-4">
-        <TokensSection />
-      </div>
-
-      <div className="container max-w-7xl flex flex-col gap-8 py-10">
+      <div className="container max-w-7xl flex flex-col py-10">
         <div className="flex flex-col gap-14">
-          {EXPLORE_PAGE_DATA.map((category, idx) => (
-            <Fragment key={category.id}>
-              {Math.floor(EXPLORE_PAGE_DATA.length / 2) === idx && (
-                <PublishUpsellCard />
-              )}
-              <ContractRow category={category} />
-            </Fragment>
-          ))}
+          <PopularSection />
+          <ContractRow category={MARKETS} />
+          <ContractRow category={NFTS} prefixCard={<NFTCollectionCard />} />
+          <ContractRow category={SMART_WALLET} />
+          <ContractRow category={AIRDROP} />
+          <ContractRow category={STAKING} />
+          <ContractRow category={GOVERNANCE} />
+          <ContractRow category={STYLUS} />
+          <DeployUpsellCard />
         </div>
-
-        <DeployUpsellCard />
       </div>
     </div>
   );
 }
+
+function PopularSection() {
+  return (
+    <section>
+      <h2 className="font-semibold text-2xl tracking-tight mb-1">Popular</h2>
+      <p className="text-muted-foreground mb-4">
+        A collection of our most deployed contracts.
+      </p>
+      <div className="relative z-0 grid grid-cols-1 gap-4 md:grid-cols-3">
+        <CoinCard />
+        <NFTCollectionCard />
+      </div>
+    </section>
+  );
+}

apps/dashboard/src/app/(app)/(dashboard)/explore/tokens-section.tsx

@@ -1,111 +0,0 @@
-"use client";
-
-import { ZapIcon } from "lucide-react";
-import Link from "next/link";
-import { reportTokenUpsellClicked } from "@/analytics/report";
-import { GridPattern } from "@/components/ui/background-patterns";
-import { Badge } from "@/components/ui/badge";
-import { cn } from "@/lib/utils";
-
-export function TokensSection() {
-  return (
-    <div className="bg-card p-4 lg:py-8 lg:px-6 border rounded-xl relative w-full overflow-hidden">
-      <GridPattern
-        width={30}
-        height={30}
-        strokeDasharray={"4 2"}
-        className="text-border dark:text-border/70 hidden lg:block translate-x-5"
-        style={{
-          maskImage:
-            "linear-gradient(to bottom left,white,transparent,transparent)",
-        }}
-      />
-
-      <Badge
-        variant="outline"
-        className="text-sm bg-background h-auto px-3 py-1 gap-2 mb-4"
-      >
-        <div className="rounded-full bg-primary size-2" />
-        New
-      </Badge>
-
-      <h2 className="font-semibold text-2xl tracking-tight mb-1">
-        Launch Your Tokens Effortlessly
-      </h2>
-      <p className="text-muted-foreground mb-6 text-sm lg:text-base">
-        Deploy contract and configure all settings you need to launch your token
-        in one seamless flow
-      </p>
-
-      <div className="grid grid-cols-1 md:grid-cols-2 gap-4 max-w-4xl">
-        <CardLink
-          assetType="coin"
-          title="Launch Coin"
-          description="Launch an ERC-20 token to create a cryptocurrency"
-          href="/team/~/~project/tokens/create/token"
-          bullets={[
-            "Deploy Contract",
-            "Configure Price and Supply",
-            "Airdrop Tokens",
-          ]}
-        />
-
-        <CardLink
-          assetType="nft"
-          title="Launch NFT Collection"
-          description="Launch an ERC-721 or ERC-1155 NFT collection"
-          href="/team/~/~project/tokens/create/nft"
-          bullets={[
-            "Deploy Contract",
-            "Upload NFTs",
-            "Configure Price and Supply",
-          ]}
-        />
-      </div>
-    </div>
-  );
-}
-
-function CardLink(props: {
-  title: string;
-  description: string;
-  href: string;
-  assetType: "nft" | "coin";
-  bullets: string[];
-}) {
-  return (
-    <div
-      className={cn(
-        "relative flex flex-col rounded-lg border p-4 cursor-pointer hover:border-active-border bg-background",
-      )}
-    >
-      <div className="mb-3 flex">
-        <div className="flex items-center justify-center rounded-full border p-2 bg-card">
-          <ZapIcon className="size-4 text-muted-foreground" />
-        </div>
-      </div>
-
-      <h3 className="mb-0.5 font-semibold text-lg tracking-tight">
-        <Link
-          className="before:absolute before:inset-0"
-          href={props.href}
-          onClick={() => {
-            reportTokenUpsellClicked({
-              assetType: props.assetType,
-              pageType: "explore",
-            });
-          }}
-        >
-          {props.title}
-        </Link>
-      </h3>
-      <p className="text-muted-foreground text-sm">{props.description}</p>
-
-      <ul className="mt-4 space-y-1 text-sm list-disc list-inside text-muted-foreground">
-        {props.bullets.map((bullet) => (
-          <li key={bullet}>{bullet}</li>
-        ))}
-      </ul>
-    </div>
-  );
-}

apps/dashboard/src/app/(app)/account/overview/AccountTeamsUI.tsx

@@ -18,7 +18,6 @@ import {
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { getValidTeamPlan } from "@/utils/getValidTeamPlan";
 import { SearchInput } from "../components/SearchInput";
 
 export function AccountTeamsUI(props: {
@@ -117,8 +116,6 @@ function TeamRow(props: {
   role: TeamAccountRole;
   client: ThirdwebClient;
 }) {
-  const plan = getValidTeamPlan(props.team);
-
   return (
     <div className="flex items-center justify-between gap-2">
       {/* start */}
@@ -133,7 +130,11 @@ function TeamRow(props: {
         <div>
           <div className="flex items-center gap-3">
             <p className="font-semibold text-sm">{props.team.name}</p>
-            <TeamPlanBadge plan={plan} teamSlug={props.team.slug} />
+            <TeamPlanBadge
+              plan={props.team.billingPlan}
+              teamSlug={props.team.slug}
+              isLegacyPlan={props.team.isLegacyPlan}
+            />
           </div>
           <p className="text-muted-foreground text-sm capitalize">
             {props.role.toLowerCase()}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/TeamSidebarLayout.tsx

@@ -92,7 +92,7 @@ export function TeamSidebarLayout(props: {
           label: "Documentation",
         },
         {
-          href: "https://playground.thirdweb.com/connect/sign-in/button",
+          href: "https://playground.thirdweb.com/wallets/sign-in/button",
           icon: BoxIcon,
           label: "Playground",
         },

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/analytics/page.tsx

@@ -6,13 +6,12 @@ import {
 } from "responsive-rsc";
 import { defineChain } from "thirdweb";
 import { type ChainMetadata, getChainMetadata } from "thirdweb/chains";
-import { getWalletInfo, type WalletId } from "thirdweb/wallets";
 import {
   getClientTransactions,
+  getEOAWalletConnections,
   getInAppWalletUsage,
   getUniversalBridgeUsage,
   getUserOpUsage,
-  getWalletConnections,
 } from "@/api/analytics";
 import { getAuthToken } from "@/api/auth-token";
 import { getTeamBySlug } from "@/api/team/get-team";
@@ -26,7 +25,7 @@ import { getFiltersFromSearchParams } from "@/lib/time";
 import type {
   InAppWalletStats,
   UserOpStats,
-  WalletStats,
+  WalletStatsWithName,
 } from "@/types/analytics";
 import { loginRedirect } from "@/utils/redirects";
 import { PieChartCard } from "../../../../components/Analytics/PieChartCard";
@@ -240,7 +239,7 @@ async function AsyncWalletDistributionCard(props: {
   range: Range;
   authToken: string;
 }) {
-  const walletConnections = await getWalletConnections(
+  const walletConnections = await getEOAWalletConnections(
     {
       from: props.range.from,
       period: "all",
@@ -373,29 +372,19 @@ async function AsyncTotalSponsoredCard(props: {
   ) : (
     <EmptyStateCard
       link="https://portal.thirdweb.com/typescript/v5/account-abstraction/get-started"
-      metric="Account Abstraction"
+      metric="Gas Sponsorship"
     />
   );
 }
 
-async function WalletDistributionCard({ data }: { data: WalletStats[] }) {
-  const formattedData = await Promise.all(
-    data.map(async (w) => {
-      const wallet = await getWalletInfo(w.walletType as WalletId).catch(
-        () => ({ name: w.walletType }),
-      );
-      return {
-        totalConnections: w.totalConnections,
-        uniqueWalletsConnected: w.uniqueWalletsConnected,
-        walletName: wallet.name,
-        walletType: w.walletType,
-      };
-    }),
-  );
-
+async function WalletDistributionCard({
+  data,
+}: {
+  data: WalletStatsWithName[];
+}) {
   return (
     <PieChartCard
-      data={formattedData.map(({ walletName, uniqueWalletsConnected }) => {
+      data={data.map(({ walletName, uniqueWalletsConnected }) => {
         return {
           label: walletName,
           value: uniqueWalletsConnected,

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/billing/components/PlanInfoCard.tsx

@@ -73,21 +73,24 @@ export function PlanInfoCardUI(props: {
               <h3 className="font-semibold text-2xl capitalize tracking-tight">
                 {validPlan === "growth_legacy" ? "Growth" : validPlan} Plan
               </h3>
-              {validPlan.includes("legacy") && (
+              {props.team.isLegacyPlan && (
                 <Badge variant="warning">Legacy</Badge>
               )}
               {trialEndsInFuture && <Badge variant="default">Trial</Badge>}
             </div>
 
-            {validPlan.includes("legacy") && (
+            {props.team.isLegacyPlan && (
               <p className="text-sm text-yellow-600">
-                You are on the legacy plan. You may save by upgrading to new
-                plan.{" "}
+                Legacy plans will be upgraded to new plans automatically on
+                January 1st, 2026.
+                <br />
                 <UnderlineLink
                   className="decoration-yellow-600/50"
-                  href="/pricing"
+                  href="https://blog.thirdweb.com/retiring-legacy-pricing-plans-on-january-1st-2026"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
-                  Learn More
+                  Learn more about changes to legacy plans
                 </UnderlineLink>
               </p>
             )}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/auth-options-form.client.tsx

@@ -58,6 +58,7 @@ const authOptions = [
   "apple",
   "coinbase",
   "line",
+  "epic",
 ] as const satisfies AuthOption[];
 
 type AuthOptionsFormData = {

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/users/page.tsx

@@ -2,7 +2,7 @@ import { redirect } from "next/navigation";
 import { getAuthToken } from "@/api/auth-token";
 import { fetchEcosystem } from "@/api/team/ecosystems";
 import { getTeamBySlug } from "@/api/team/get-team";
-import { InAppWalletUsersPageContent } from "@/components/in-app-wallet-users-content/in-app-wallet-users-content";
+import { UserWalletsTable } from "@/components/in-app-wallet-users-content/user-wallets-table";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { loginRedirect } from "@/utils/redirects";
 
@@ -30,7 +30,7 @@ export default async function EcosystemUsersPage(props: {
   });
 
   return (
-    <InAppWalletUsersPageContent
+    <UserWalletsTable
       authToken={authToken}
       client={client}
       ecosystemSlug={ecosystem.slug}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/SupportTicketForm.tsx

@@ -26,14 +26,6 @@ const EngineSupportForm = dynamic(
     ssr: false,
   },
 );
-const ContractSupportForm = dynamic(
-  () =>
-    import("./contact-forms/contracts").then((mod) => mod.ContractSupportForm),
-  {
-    loading: () => <Skeleton className="h-12" />,
-    ssr: false,
-  },
-);
 const AccountSupportForm = dynamic(
   () => import("./contact-forms/account").then((mod) => mod.AccountSupportForm),
   {
@@ -48,14 +40,6 @@ const OtherSupportForm = dynamic(
     ssr: false,
   },
 );
-const PaymentsSupportForm = dynamic(
-  () =>
-    import("./contact-forms/payments").then((mod) => mod.PaymentsSupportForm),
-  {
-    loading: () => <Skeleton className="h-12" />,
-    ssr: false,
-  },
-);
 const TokensMarketplaceSupportForm = dynamic(
   () =>
     import("./contact-forms/tokens-marketplace").then(
@@ -68,13 +52,14 @@ const TokensMarketplaceSupportForm = dynamic(
 );
 
 const productOptions = [
-  { component: <ConnectSupportForm />, label: "Wallets" },
-  { component: <EngineSupportForm />, label: "Transactions" },
-  { component: <PaymentsSupportForm />, label: "Payments" },
-  { component: <ContractSupportForm />, label: "Contracts" },
+  { component: <ConnectSupportForm />, label: "Working with User Wallets" },
+  {
+    component: <EngineSupportForm />,
+    label: "Using API/SDK’s, errored transactions",
+  },
   {
     component: <TokensMarketplaceSupportForm />,
-    label: "Tokens / Marketplace",
+    label: "Creating, Bridging and swapping tokens",
   },
   { component: <AccountSupportForm />, label: "Account" },
   { component: <OtherSupportForm />, label: "Other" },

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/AffectedAreaInput.tsx

@@ -1,67 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
-import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
-import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
-import { UnitySupportForm } from "../../shared/SupportForm_UnityInput";
-
-const AFFECTED_AREAS = ["Dashboard", "Application"];
-
-export const AffectedAreaInput = () => {
-  const [selectedAffectedArea, setSelectedAffectedArea] = useState<string>("");
-  const [selectedSDK, setSelectedSDK] = useState<string>("");
-  const [description, setDescription] = useState<string>("");
-  const [sdkDescription, setSdkDescription] = useState<string>("");
-
-  return (
-    <>
-      <SupportForm_SelectInput
-        formLabel="Affected area"
-        name="extraInfo_Affected_Area"
-        onValueChange={setSelectedAffectedArea}
-        options={AFFECTED_AREAS}
-        promptText="Select an affected area"
-        required={true}
-        value={selectedAffectedArea}
-      />
-      {selectedAffectedArea &&
-        (selectedAffectedArea === "Application" ? (
-          <>
-            <SupportForm_SelectInput
-              formLabel="SDK"
-              name="extraInfo_SDK"
-              onValueChange={setSelectedSDK}
-              options={["TypeScript", "React", "React Native", "Unity"]}
-              promptText="Select SDK"
-              required={true}
-              value={selectedSDK}
-            />
-            {selectedSDK && (
-              <>
-                {selectedSDK === "Unity" && <UnitySupportForm />}
-                <SupportForm_TextInput
-                  formLabel="SDK Version"
-                  formValue="extraInfo_SDK_Version"
-                  inputType="text"
-                  required={true}
-                />
-                <SupportForm_TextInput
-                  formLabel="Application URL"
-                  formValue="extraInfo_Application_URL"
-                  inputType="url"
-                  required={false}
-                />
-                <DescriptionInput
-                  value={sdkDescription}
-                  onChange={setSdkDescription}
-                />
-              </>
-            )}
-          </>
-        ) : (
-          <DescriptionInput value={description} onChange={setDescription} />
-        ))}
-    </>
-  );
-};

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/connect/index.tsx

@@ -1,116 +1,91 @@
+"use client";
+
 import { type ReactElement, useState } from "react";
 import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
 import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
 import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
-import { UnitySupportForm } from "../../shared/SupportForm_UnityInput";
-import { AffectedAreaInput } from "./AffectedAreaInput";
 
 type ProblemAreaItem = {
   label: string;
   component: ReactElement;
 };
 
-const SDKVersionInput = () => (
-  <SupportForm_TextInput
-    formLabel="SDK Version"
-    formValue="extraInfo_SDK_Version"
-    inputType="text"
-    required={true}
-  />
-);
-
-const OSSelect = () => {
-  const [selectedOS, setSelectedOS] = useState<string>("");
+const SocialEmailLoginIssuesComponent = () => {
+  const [description, setDescription] = useState<string>("");
   return (
-    <SupportForm_SelectInput
-      formLabel="OS"
-      name="extraInfo_OS"
-      onValueChange={setSelectedOS}
-      options={["Windows", "MacOS", "Linux", "Other"]}
-      promptText="Select an operating system"
-      required={true}
-      value={selectedOS}
-    />
+    <>
+      <SupportForm_TextInput
+        formLabel="User ID/Email with issue"
+        formValue="extraInfo_User_ID_Email"
+        inputType="text"
+        placeholder="Enter user ID or email"
+        required={true}
+      />
+      <DescriptionInput value={description} onChange={setDescription} />
+    </>
   );
 };
 
-const DescriptionInputWrapper = () => {
+const UserWalletCustomAuthComponent = () => {
+  const [description, setDescription] = useState<string>("");
+  return (
+    <>
+      <SupportForm_TextInput
+        formLabel="Custom auth endpoint"
+        formValue="extraInfo_Custom_Auth_Endpoint"
+        inputType="text"
+        placeholder="Enter custom auth endpoint"
+        required={true}
+      />
+      <SupportForm_TextInput
+        formLabel="Support ID"
+        formValue="extraInfo_Support_ID"
+        inputType="text"
+        placeholder="Enter support ID (optional)"
+        required={false}
+      />
+      <DescriptionInput value={description} onChange={setDescription} />
+    </>
+  );
+};
+
+const AccountAbstractionComponent = () => {
+  const [description, setDescription] = useState<string>("");
+  return (
+    <>
+      <SupportForm_TextInput
+        formLabel="Support ID"
+        formValue="extraInfo_Support_ID"
+        inputType="text"
+        placeholder="Enter support ID (optional)"
+        required={false}
+      />
+      <DescriptionInput value={description} onChange={setDescription} />
+    </>
+  );
+};
+
+const ThirdPartyEOAWalletsComponent = () => {
   const [description, setDescription] = useState<string>("");
   return <DescriptionInput value={description} onChange={setDescription} />;
 };
 
 const PROBLEM_AREAS: ProblemAreaItem[] = [
   {
-    component: <AffectedAreaInput />,
-    label: "In-app wallet login issues",
+    component: <SocialEmailLoginIssuesComponent />,
+    label: "Social/Email login issues",
   },
   {
-    component: <AffectedAreaInput />,
-    label: "In-app wallet transaction issues",
+    component: <UserWalletCustomAuthComponent />,
+    label: "User wallet with custom auth",
   },
   {
-    component: <AffectedAreaInput />,
-    label: "In-app wallet Custom Auth",
-  },
-  {
-    component: <AffectedAreaInput />,
+    component: <AccountAbstractionComponent />,
     label: "Account Abstraction",
   },
   {
-    component: (
-      <>
-        <SDKVersionInput />
-        <SupportForm_TextInput
-          formLabel="Application URL"
-          formValue="extraInfo_Application_URL"
-          inputType="url"
-          required={false}
-        />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "thirdweb SDKs",
-  },
-  {
-    component: (
-      <>
-        <UnitySupportForm />
-        <SDKVersionInput />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Unity SDK",
-  },
-  {
-    component: (
-      <>
-        <SDKVersionInput />
-        <OSSelect />
-        <SupportForm_TextInput
-          formLabel="Framework"
-          formValue="extraInfo_dotNET_Framework"
-          inputType="text"
-          placeholder="MAUI | Blazor | Godot, etc"
-          required={false}
-        />
-        <SupportForm_TextInput
-          formLabel="Target OS"
-          formValue="extraInfo_dotNET_Target_OS"
-          inputType="text"
-          required={false}
-        />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: ".NET SDK",
-  },
-  {
-    component: <AffectedAreaInput />,
-    label: "Pay",
-  },
-  {
-    component: <AffectedAreaInput />,
-    label: "Auth",
+    component: <ThirdPartyEOAWalletsComponent />,
+    label: "Third party/EOA wallets",
   },
 ];
 

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/contracts/index.tsx

@@ -1,138 +0,0 @@
-import { type ReactElement, useState } from "react";
-import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
-import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
-import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
-
-type ProblemAreaItem = {
-  label: string;
-  component: ReactElement;
-};
-
-const NetworkInput = () => (
-  <SupportForm_TextInput
-    formLabel="Network"
-    formValue="extraInfo_Network"
-    inputType="text"
-    placeholder="Network name or chain ID"
-    required={true}
-  />
-);
-
-const ContractAddressInput = () => (
-  <SupportForm_TextInput
-    formLabel="Contract address"
-    formValue="extraInfo_Contract_Address"
-    inputType="text"
-    required={true}
-  />
-);
-
-const ContractFunctionInput = () => (
-  <SupportForm_TextInput
-    formLabel="Contract function"
-    formValue="extraInfo_Contract_Function"
-    inputType="text"
-    required={true}
-  />
-);
-
-const ContractTypeInput = () => (
-  <SupportForm_TextInput
-    formLabel="Contract type"
-    formValue="extraInfo_Contract_Type"
-    inputType="text"
-    placeholder={`"MarketplaceV3 | "NFTDrop" | ...`}
-    required={false}
-  />
-);
-
-const ContractAffectedAreaInput = () => {
-  const [selectedAffectedArea, setSelectedAffectedArea] = useState<string>("");
-  return (
-    <SupportForm_SelectInput
-      formLabel="Contract affected area"
-      name="extraInfo_Affected_Area"
-      onValueChange={setSelectedAffectedArea}
-      options={["Dashboard", "SDK"]}
-      promptText="Select an affected area"
-      required={true}
-      value={selectedAffectedArea}
-    />
-  );
-};
-
-const DescriptionInputWrapper = () => {
-  const [description, setDescription] = useState<string>("");
-  return <DescriptionInput value={description} onChange={setDescription} />;
-};
-
-const CONTRACT_PROBLEM_AREAS: ProblemAreaItem[] = [
-  {
-    component: (
-      <>
-        <NetworkInput />
-        <ContractTypeInput />
-        <ContractAffectedAreaInput />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Deploying a contract",
-  },
-  {
-    component: (
-      <>
-        <NetworkInput />
-        <ContractAddressInput />
-        <ContractTypeInput />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Contract verification",
-  },
-  {
-    component: (
-      <>
-        <NetworkInput />
-        <ContractAddressInput />
-        <ContractFunctionInput />
-        <ContractAffectedAreaInput />
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Calling a function in my contract",
-  },
-  {
-    component: (
-      <>
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Developing a custom contract",
-  },
-  {
-    component: (
-      <>
-        <DescriptionInputWrapper />
-      </>
-    ),
-    label: "Other",
-  },
-];
-
-export function ContractSupportForm() {
-  const [problemArea, setProblemArea] = useState<string>("");
-  return (
-    <>
-      <SupportForm_SelectInput
-        formLabel="Problem area"
-        name="extraInfo_Problem_Area"
-        onValueChange={setProblemArea}
-        options={CONTRACT_PROBLEM_AREAS.map((o) => o.label)}
-        promptText="Select a problem area"
-        required={true}
-        value={problemArea}
-      />
-      {CONTRACT_PROBLEM_AREAS.find((o) => o.label === problemArea)?.component}
-    </>
-  );
-}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/engine/index.tsx

@@ -2,56 +2,62 @@ import { useState } from "react";
 import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
 import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
 import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
+import { UnitySupportForm } from "../../shared/SupportForm_UnityInput";
 
-const ENGINE_TYPES = ["Cloud (V3)", "Dedicated (V2)"];
-const ENGINE_PROBLEM_AREAS = [
-  "SSL Issues",
-  "Transaction queueing issues",
-  "401 - Unauthorized",
-  "404 - Endpoint Not Found",
-  "Other",
+const API_SDK_OPTIONS = [
+  "API endpoint",
+  "React/TypeScript",
+  "Unity/.NET",
+  "React Native",
 ];
 
 export function EngineSupportForm() {
-  const [selectedEngineType, setSelectedEngineType] = useState<string>("");
-  const [problemArea, setProblemArea] = useState<string>("");
+  const [selectedSDK, setSelectedSDK] = useState<string>("");
   const [description, setDescription] = useState<string>("");
 
   return (
     <>
       <SupportForm_SelectInput
-        formLabel="Type"
-        name="extraInfo_Engine_Type"
-        onValueChange={setSelectedEngineType}
-        options={ENGINE_TYPES}
-        promptText="Select Engine type"
+        formLabel="Which API/SDK are you using?"
+        name="extraInfo_API_SDK"
+        onValueChange={setSelectedSDK}
+        options={API_SDK_OPTIONS}
+        promptText="Select a problem area"
         required={true}
-        value={selectedEngineType}
-      />{" "}
-      {selectedEngineType && (
+        value={selectedSDK}
+      />
+      {selectedSDK && (
         <>
-          <SupportForm_SelectInput
-            formLabel="Problem area"
-            name="extraInfo_Problem_Area"
-            onValueChange={setProblemArea}
-            options={ENGINE_PROBLEM_AREAS}
-            promptText="Select a problem area"
-            required={true}
-            value={problemArea}
-          />
-
-          {problemArea && (
-            <>
+          {selectedSDK === "Unity/.NET" ? (
+            <UnitySupportForm />
+          ) : (
+            selectedSDK !== "API endpoint" && (
               <SupportForm_TextInput
-                formLabel="Engine URL"
-                formValue="extraInfo_Engine_URL"
-                inputType="url"
-                placeholder="https://your-engine-url.com"
+                formLabel="Version of SDK"
+                formValue="extraInfo_SDK_Version"
+                inputType="text"
+                placeholder="e.g. 3.12.0"
                 required={true}
               />
-              <DescriptionInput value={description} onChange={setDescription} />
-            </>
+            )
           )}
+          <SupportForm_TextInput
+            formLabel="Queue/Support ID in logs"
+            formValue="extraInfo_Queue_Support_ID"
+            inputType="text"
+            placeholder="Enter support ID from logs"
+            required={false}
+          />
+          {selectedSDK === "API endpoint" && (
+            <SupportForm_TextInput
+              formLabel="API endpoint URL with parameters"
+              formValue="extraInfo_API_Endpoint_URL"
+              inputType="url"
+              placeholder="https://api.example.com/endpoint?param=value"
+              required={false}
+            />
+          )}
+          <DescriptionInput value={description} onChange={setDescription} />
         </>
       )}
     </>

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/other/index.tsx

@@ -14,6 +14,7 @@ const OTHER_PROBLEM_AREAS = [
   "Bug report",
   "Documentation",
   "Integration help",
+  "Agents/x402 and AI",
   "Other",
 ];
 export function OtherSupportForm() {

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/payments/index.tsx

@@ -1,55 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { DescriptionInput } from "../../shared/SupportForm_DescriptionInput";
-import { SupportForm_SelectInput } from "../../shared/SupportForm_SelectInput";
-import { SupportForm_TextInput } from "../../shared/SupportForm_TextInput";
-
-const PAYMENT_AREAS = ["Dashboard", "Application"];
-
-export function PaymentsSupportForm() {
-  const [area, setArea] = useState<string>("");
-  const [description, setDescription] = useState<string>("");
-
-  return (
-    <>
-      <SupportForm_SelectInput
-        formLabel="Affected Area"
-        name="extraInfo_Payments_Area"
-        onValueChange={setArea}
-        options={PAYMENT_AREAS}
-        promptText="Select affected area"
-        required={true}
-        value={area}
-      />
-      {area === "Application" && (
-        <>
-          <SupportForm_TextInput
-            formLabel="SDK"
-            formValue="extraInfo_Payments_SDK"
-            inputType="text"
-            placeholder="e.g. React, Unity, iOS, etc."
-            required={true}
-          />
-          <SupportForm_TextInput
-            formLabel="SDK Version"
-            formValue="extraInfo_Payments_SDK_Version"
-            inputType="text"
-            placeholder="e.g. 3.12.0"
-            required={true}
-          />
-          <SupportForm_TextInput
-            formLabel="Application URL"
-            formValue="extraInfo_Payments_App_URL"
-            inputType="url"
-            placeholder="https://your-app-url.com"
-            required={true}
-          />
-        </>
-      )}
-      {(area === "Application" || area === "Dashboard") && (
-        <DescriptionInput value={description} onChange={setDescription} />
-      )}
-    </>
-  );
-}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/_components/contact-forms/tokens-marketplace/index.tsx

@@ -8,10 +8,10 @@ export function TokensMarketplaceSupportForm() {
   return (
     <>
       <SupportForm_TextInput
-        formLabel="Address"
-        formValue="extraInfo_TokensMarketplace_Address"
+        formLabel="Token address or symbol"
+        formValue="extraInfo_Token_Address_Symbol"
         inputType="text"
-        placeholder="Enter the relevant address"
+        placeholder="Enter token address or symbol (e.g. 0x... or ETH)"
         required={true}
       />
       <SupportForm_TextInput
@@ -21,6 +21,13 @@ export function TokensMarketplaceSupportForm() {
         placeholder="e.g. Ethereum, Polygon, etc."
         required={true}
       />
+      <SupportForm_TextInput
+        formLabel="Support ID in logs"
+        formValue="extraInfo_Support_ID_Logs"
+        inputType="text"
+        placeholder="Enter support ID from logs"
+        required={false}
+      />
       <DescriptionInput value={description} onChange={setDescription} />
     </>
   );

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/support/page.tsx

@@ -28,6 +28,7 @@ export default async function Page(props: {
       <div className="flex flex-col grow justify-center items-center">
         <UpsellContent
           currentPlan={team.billingPlan}
+          isLegacyPlan={team.isLegacyPlan}
           featureDescription="Create support cases for your projects"
           featureName="Support Center"
           requiredPlan="starter"

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/account-abstraction/page.tsx

@@ -1,20 +1,29 @@
 import { redirect } from "next/navigation";
+import type { SearchParams } from "nuqs/server";
+import { getUserOpUsage } from "@/api/analytics";
 import { getAuthToken } from "@/api/auth-token";
 import { getProjects } from "@/api/project/projects";
 import { getTeamBySlug } from "@/api/team/get-team";
 import { getTeamSubscriptions } from "@/api/team/team-subscription";
-import { SponsoredTransactionsTable } from "@/components/sponsored-transactions-table/SponsoredTransactionsTable";
+import {
+  getLastNDaysRange,
+  type Range,
+} from "@/components/analytics/date-range-selector";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 import { loginRedirect } from "@/utils/redirects";
+import { AccountAbstractionSummary } from "../../../../[project_slug]/(sidebar)/account-abstraction/AccountAbstractionAnalytics/AccountAbstractionSummary";
+import { AccountAbstractionAnalytics } from "../../../../[project_slug]/(sidebar)/account-abstraction/aa-analytics";
+import { searchParamLoader } from "../../../../[project_slug]/(sidebar)/account-abstraction/search-params";
 
 export default async function Page(props: {
   params: Promise<{
     team_slug: string;
   }>;
+  searchParams: Promise<SearchParams>;
 }) {
-  const params = await props.params;
-  const [team, authToken] = await Promise.all([
-    getTeamBySlug(params.team_slug),
+  const [params, parsedSearchParams, authToken] = await Promise.all([
+    props.params,
+    searchParamLoader(props.searchParams),
     getAuthToken(),
   ]);
 
@@ -22,6 +31,8 @@ export default async function Page(props: {
     loginRedirect(`/team/${params.team_slug}/~/usage/account-abstraction`);
   }
 
+  const team = await getTeamBySlug(params.team_slug);
+
   if (!team) {
     redirect("/team");
   }
@@ -44,20 +55,51 @@ export default async function Page(props: {
     );
   }
 
+  const interval = parsedSearchParams.interval ?? "week";
+  const rangeType = parsedSearchParams.range || "last-120";
+
+  const range: Range = {
+    from:
+      rangeType === "custom"
+        ? parsedSearchParams.from
+        : getLastNDaysRange(rangeType).from,
+    to:
+      rangeType === "custom"
+        ? parsedSearchParams.to
+        : getLastNDaysRange(rangeType).to,
+    type: rangeType,
+  };
+
+  const userOpStats = await getUserOpUsage(
+    {
+      from: range.from,
+      period: interval,
+      teamId: team.id,
+      to: range.to,
+    },
+    authToken,
+  );
+
   const client = getClientThirdwebClient({
     jwt: authToken,
     teamId: team.id,
   });
 
   return (
-    <div className="flex flex-col gap-14">
-      <SponsoredTransactionsTable
+    <div className="flex flex-col gap-10">
+      <AccountAbstractionSummary
+        authToken={authToken}
+        teamId={team.id}
+        from={range.from}
+        to={range.to}
+      />
+
+      <AccountAbstractionAnalytics
         client={client}
-        from={usageSubscription.currentPeriodStart}
         projects={projects}
         teamId={team.id}
         teamSlug={team.slug}
-        to={usageSubscription.currentPeriodEnd}
+        userOpStats={userOpStats}
         variant="team"
       />
     </div>

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/layout.tsx

@@ -13,7 +13,7 @@ export default async function Layout(props: {
 
   return (
     <div className="flex grow flex-col">
-      <div className="border-border pt-10 pb-4">
+      <div className="border-border pt-10 pb-6">
         <div className="container max-w-7xl flex flex-col gap-4 lg:flex-row lg:justify-between">
           <h1 className="font-semibold text-3xl tracking-tight">Usage</h1>
           <div className="items-center gap-3 hidden lg:flex">
@@ -47,7 +47,7 @@ export default async function Layout(props: {
             path: `${usagePath}/storage`,
           },
           {
-            name: "Account Abstraction",
+            name: "Gas Sponsorship",
             path: `${usagePath}/account-abstraction`,
           },
         ]}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/page.tsx

@@ -43,7 +43,8 @@ export default async function Page(props: {
       <div className="grow flex flex-col justify-center items-center">
         <UpsellContent
           currentPlan={team.billingPlan}
-          featureDescription="View RPC, Wallet, Storage, Account Abstraction, Engine Cloud, Webhooks usage and more"
+          isLegacyPlan={team.isLegacyPlan}
+          featureDescription="View RPC, Wallet, Storage, Gas Sponsorship, Engine Cloud, Webhooks usage and more"
           featureName="Usage"
           requiredPlan="starter"
           teamSlug={params.team_slug}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/count-graph.tsx

@@ -57,7 +57,7 @@ export function CountGraph(props: {
         return format(label, "MMM dd, HH:mm");
       }}
       xAxis={{
-        sameDay: true,
+        showHour: true,
       }}
       yAxis
     />

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/components/rate-graph.tsx

@@ -57,7 +57,7 @@ export function RateGraph(props: {
         return format(label, "MMM dd, HH:mm");
       }}
       xAxis={{
-        sameDay: true,
+        showHour: true,
       }}
       yAxis
     />

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/usage/rpc/page.tsx

@@ -33,7 +33,6 @@ export default async function RPCUsage(props: {
     redirect("/team");
   }
 
-  const currentPlan = team.billingPlan;
   const currentRateLimit = team.capabilities.rpc.rateLimit;
 
   const apiData = await getLast24HoursRPCUsage({
@@ -102,7 +101,11 @@ export default async function RPCUsage(props: {
                 <div className="font-bold text-2xl capitalize">
                   {currentRateLimit.toLocaleString()} RPS
                 </div>
-                <TeamPlanBadge plan={currentPlan} teamSlug={team.slug} />
+                <TeamPlanBadge
+                  plan={team.billingPlan}
+                  teamSlug={team.slug}
+                  isLegacyPlan={team.isLegacyPlan}
+                />
               </div>
             </CardContent>
           </Card>

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/AccountAbstractionAnalytics/AccountAbstractionSummary.tsx

@@ -34,13 +34,17 @@ function AccountAbstractionSummaryInner(props: {
 
 async function AsyncAccountAbstractionSummary(props: {
   teamId: string;
-  projectId: string;
+  projectId?: string;
   authToken: string;
+  from?: Date;
+  to?: Date;
 }) {
   const aggregateUserOpStats = await getAggregateUserOpUsage(
     {
       projectId: props.projectId,
       teamId: props.teamId,
+      from: props.from,
+      to: props.to,
     },
     props.authToken,
   );
@@ -55,8 +59,10 @@ async function AsyncAccountAbstractionSummary(props: {
 
 export function AccountAbstractionSummary(props: {
   teamId: string;
-  projectId: string;
+  projectId?: string;
   authToken: string;
+  from?: Date;
+  to?: Date;
 }) {
   return (
     <Suspense
@@ -71,6 +77,8 @@ export function AccountAbstractionSummary(props: {
         projectId={props.projectId}
         teamId={props.teamId}
         authToken={props.authToken}
+        from={props.from}
+        to={props.to}
       />
     </Suspense>
   );

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/AccountAbstractionAnalytics/GasMetricsChartCard.tsx

@@ -0,0 +1,302 @@
+"use client";
+
+import { format } from "date-fns";
+import { useMemo, useState } from "react";
+import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
+import { DocLink } from "@/components/blocks/DocLink";
+import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
+import { Button } from "@/components/ui/button";
+import type { ChartConfig } from "@/components/ui/chart";
+import { useAllChainsData } from "@/hooks/chains/allChains";
+import { DotNetIcon } from "@/icons/brand-icons/DotNetIcon";
+import { ReactIcon } from "@/icons/brand-icons/ReactIcon";
+import { TypeScriptIcon } from "@/icons/brand-icons/TypeScriptIcon";
+import { UnityIcon } from "@/icons/brand-icons/UnityIcon";
+import { UnrealIcon } from "@/icons/brand-icons/UnrealIcon";
+import type { UserOpStats } from "@/types/analytics";
+import { formatTickerNumber } from "@/utils/format-utils";
+
+type ChartData = Record<string, number> & {
+  time: string;
+};
+
+type MetricType =
+  | "sponsoredTransactions"
+  | "gasUnits"
+  | "avgGasPrice"
+  | "costPerGasUnit";
+
+export function GasMetricsChartCard(props: {
+  userOpStats: UserOpStats[];
+  isPending: boolean;
+}) {
+  const { userOpStats } = props;
+  const topChainsToShow = 10;
+  const chainsStore = useAllChainsData();
+  const [metricType, setMetricType] = useState<MetricType>(
+    "sponsoredTransactions",
+  );
+
+  const { chartConfig, chartData } = useMemo(() => {
+    const _chartConfig: ChartConfig = {};
+    const _chartDataMap: Map<string, ChartData> = new Map();
+    const chainIdToVolumeMap: Map<string, number> = new Map();
+
+    // for each stat, add it in _chartDataMap
+    for (const stat of userOpStats) {
+      const chartData = _chartDataMap.get(stat.date);
+      const { chainId } = stat;
+      const chain = chainsStore.idToChain.get(Number(chainId));
+      const chainName = chain?.name || chainId || "Unknown";
+
+      let value: number;
+      if (metricType === "sponsoredTransactions") {
+        value = stat.successful;
+      } else if (metricType === "gasUnits") {
+        value = stat.gasUnits;
+      } else if (metricType === "avgGasPrice") {
+        value = stat.avgGasPrice;
+      } else {
+        // costPerGasUnit: USD spent per gas unit (helps identify price spike impact)
+        value = stat.gasUnits > 0 ? stat.sponsoredUsd / stat.gasUnits : 0;
+      }
+
+      // if no data for current day - create new entry
+      if (!chartData) {
+        _chartDataMap.set(stat.date, {
+          time: stat.date,
+          [chainName]: value,
+        } as ChartData);
+      } else {
+        chartData[chainName] = (chartData[chainName] || 0) + value;
+      }
+
+      chainIdToVolumeMap.set(
+        chainName,
+        value + (chainIdToVolumeMap.get(chainName) || 0),
+      );
+    }
+
+    const chainsSorted = Array.from(chainIdToVolumeMap.entries())
+      .sort((a, b) => b[1] - a[1])
+      .map((w) => w[0]);
+
+    const chainsToShow = chainsSorted.slice(0, topChainsToShow);
+    const chainsToTagAsOthers = chainsSorted.slice(topChainsToShow);
+
+    // replace chainIdsToTagAsOther chainId with "other"
+    for (const data of _chartDataMap.values()) {
+      for (const chainId in data) {
+        if (chainsToTagAsOthers.includes(chainId)) {
+          data.others = (data.others || 0) + (data[chainId] || 0);
+          delete data[chainId];
+        }
+      }
+    }
+
+    chainsToShow.forEach((chainName, i) => {
+      _chartConfig[chainName] = {
+        color: `hsl(var(--chart-${(i % 10) + 1}))`,
+        label: chainName,
+      };
+    });
+
+    // Add Other
+    if (chainsToTagAsOthers.length > 0) {
+      chainsToShow.push("others");
+      _chartConfig.others = {
+        color: "hsl(var(--muted-foreground))",
+        label: "Others",
+      };
+    }
+
+    return {
+      chartConfig: _chartConfig,
+      chartData: Array.from(_chartDataMap.values()).sort((a, b) => {
+        return new Date(a.time).getTime() - new Date(b.time).getTime();
+      }),
+    };
+  }, [userOpStats, chainsStore, metricType]);
+
+  const uniqueChainIds = Object.keys(chartConfig);
+  const disableActions =
+    props.isPending ||
+    chartData.length === 0 ||
+    chartData.every((data) => {
+      return Object.entries(data).every(([key, value]) => {
+        return key === "time" || value === 0;
+      });
+    });
+
+  const metricConfig = {
+    sponsoredTransactions: {
+      title: "Sponsored Transactions",
+      description: "Total number of sponsored transactions",
+      fileName: "Sponsored Transactions",
+      formatter: (value: number) => formatTickerNumber(value),
+    },
+    gasUnits: {
+      title: "Gas Units Consumed",
+      description: "Total gas units consumed by sponsored transactions",
+      fileName: "Gas Units Consumed",
+      formatter: (value: number) => formatTickerNumber(value),
+    },
+    avgGasPrice: {
+      title: "Average Gas Price",
+      description: "Average gas price in Gwei for sponsored transactions",
+      fileName: "Average Gas Price",
+      formatter: (value: number) => {
+        // Convert from wei to Gwei
+        const gwei = value / 1_000_000_000;
+        return `${formatTickerNumber(gwei)} Gwei`;
+      },
+    },
+    costPerGasUnit: {
+      title: "Cost per Gas Unit",
+      description:
+        "USD spent per gas unit - spikes indicate gas price increases",
+      fileName: "Cost per Gas Unit",
+      formatter: (value: number) => {
+        // Show in micro-USD for readability
+        return `$${(value * 1_000_000).toFixed(4)}µ`;
+      },
+    },
+  };
+
+  const config =
+    metricConfig[metricType as keyof typeof metricConfig] ||
+    metricConfig.sponsoredTransactions;
+
+  return (
+    <ThirdwebBarChart
+      chartClassName="aspect-[1] lg:aspect-[3.5]"
+      config={chartConfig}
+      customHeader={
+        <div className="relative px-6 pt-6">
+          <div className="flex items-start justify-between gap-4">
+            <div>
+              <h3 className="mb-0.5 font-semibold text-xl tracking-tight">
+                {config.title}
+              </h3>
+              <p className="text-muted-foreground text-sm">
+                {config.description}
+              </p>
+            </div>
+            <div className="flex gap-2 flex-wrap">
+              <Button
+                onClick={() => setMetricType("sponsoredTransactions")}
+                size="sm"
+                variant={
+                  metricType === "sponsoredTransactions" ? "default" : "outline"
+                }
+              >
+                Transactions
+              </Button>
+              <Button
+                onClick={() => setMetricType("gasUnits")}
+                size="sm"
+                variant={metricType === "gasUnits" ? "default" : "outline"}
+              >
+                Gas Units
+              </Button>
+              <Button
+                onClick={() => setMetricType("avgGasPrice")}
+                size="sm"
+                variant={metricType === "avgGasPrice" ? "default" : "outline"}
+              >
+                Gas Price
+              </Button>
+              <Button
+                onClick={() => setMetricType("costPerGasUnit")}
+                size="sm"
+                variant={
+                  metricType === "costPerGasUnit" ? "default" : "outline"
+                }
+              >
+                Cost Efficiency
+              </Button>
+            </div>
+          </div>
+
+          <div className="top-6 right-6 mt-4 mb-4 grid grid-cols-2 items-center gap-2 md:absolute md:my-0 md:flex md:mt-10">
+            <ExportToCSVButton
+              className="bg-background"
+              disabled={disableActions}
+              fileName={config.fileName}
+              getData={async () => {
+                const header = ["Date", ...uniqueChainIds];
+                const rows = chartData.map((data) => {
+                  const { time, ...rest } = data;
+                  return [
+                    time,
+                    ...uniqueChainIds.map((w) => (rest[w] || 0).toString()),
+                  ];
+                });
+                return { header, rows };
+              }}
+            />
+          </div>
+        </div>
+      }
+      data={chartData}
+      emptyChartState={<GasMetricsChartCardEmptyChartState />}
+      hideLabel={false}
+      isPending={props.isPending}
+      showLegend
+      toolTipLabelFormatter={(_v, item) => {
+        if (Array.isArray(item)) {
+          const time = item[0].payload.time as number;
+          return format(new Date(time), "MMM d, yyyy");
+        }
+        return undefined;
+      }}
+      toolTipValueFormatter={(value) => {
+        if (typeof value !== "number") {
+          return "";
+        }
+        return config.formatter(value);
+      }}
+      variant="stacked"
+    />
+  );
+}
+
+function GasMetricsChartCardEmptyChartState() {
+  return (
+    <div className="flex flex-col items-center justify-center">
+      <span className="mb-6 text-lg">Sponsor gas for your users</span>
+      <div className="flex max-w-md flex-wrap items-center justify-center gap-x-6 gap-y-4">
+        <DocLink
+          icon={TypeScriptIcon}
+          label="TypeScript"
+          link="https://portal.thirdweb.com/typescript/v5/account-abstraction/get-started"
+        />
+        <DocLink
+          icon={ReactIcon}
+          label="React"
+          link="https://portal.thirdweb.com/react/v5/account-abstraction/get-started"
+        />
+        <DocLink
+          icon={ReactIcon}
+          label="React Native"
+          link="https://portal.thirdweb.com/react/v5/account-abstraction/get-started"
+        />
+        <DocLink
+          icon={UnityIcon}
+          label="Unity"
+          link="https://portal.thirdweb.com/unity/v5/wallets/account-abstraction"
+        />
+        <DocLink
+          icon={UnrealIcon}
+          label="Unreal Engine"
+          link="https://portal.thirdweb.com/unreal-engine/blueprints/smart-wallet"
+        />
+        <DocLink
+          icon={DotNetIcon}
+          label=".NET"
+          link="https://portal.thirdweb.com/dotnet/wallets/providers/account-abstraction"
+        />
+      </div>
+    </div>
+  );
+}

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/AccountAbstractionAnalytics/storyUtils.ts

@@ -9,6 +9,8 @@ export function createUserOpStatsStub(days: number): UserOpStats[] {
     const successful = Math.random() * 100;
     const failed = Math.random() * 100;
     const sponsoredUsd = Math.random() * 100;
+    const gasUnits = Math.random() * 1000000; // Random gas units between 0-1M
+    const avgGasPrice = Math.random() * 100000000000; // Random gas price in wei (0-100 Gwei)
 
     stubbedData.push({
       chainId: Math.floor(Math.random() * 100).toString(),
@@ -16,6 +18,8 @@ export function createUserOpStatsStub(days: number): UserOpStats[] {
       failed,
       sponsoredUsd,
       successful,
+      gasUnits,
+      avgGasPrice,
     });
 
     if (Math.random() > 0.7) {

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/Alerts.tsx

@@ -6,9 +6,9 @@ export const SmartWalletsBillingAlert = (props: { teamSlug: string }) => {
   return (
     <Alert variant="warning">
       <CircleAlertIcon className="size-5" />
-      <AlertTitle>Account Abstraction on Mainnet</AlertTitle>
+      <AlertTitle>Gas Sponsorship on Mainnet</AlertTitle>
       <AlertDescription>
-        To enable AA on mainnet chains,{" "}
+        To enable Gas Sponsorship on mainnet chains,{" "}
         <UnderlineLink href={`/team/${props.teamSlug}/~/billing`}>
           subscribe to a billing plan.
         </UnderlineLink>

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/aa-analytics.tsx

@@ -11,17 +11,34 @@ import {
 import { IntervalSelector } from "@/components/analytics/interval-selector";
 import { SponsoredTransactionsTable } from "@/components/sponsored-transactions-table/SponsoredTransactionsTable";
 import type { UserOpStats } from "@/types/analytics";
-import { SponsoredTransactionsChartCard } from "./AccountAbstractionAnalytics/SponsoredTransactionsChartCard";
+import { GasMetricsChartCard } from "./AccountAbstractionAnalytics/GasMetricsChartCard";
 import { TotalSponsoredChartCard } from "./AccountAbstractionAnalytics/TotalSponsoredChartCard";
 import { searchParams } from "./search-params";
 
-export function AccountAbstractionAnalytics(props: {
+type AccountAbstractionAnalyticsProps = {
   userOpStats: UserOpStats[];
   teamId: string;
   teamSlug: string;
   client: ThirdwebClient;
-  projectId: string;
-}) {
+} & (
+  | {
+      variant: "project";
+      projectId: string;
+    }
+  | {
+      variant: "team";
+      projects: {
+        id: string;
+        name: string;
+        image: string | null;
+        slug: string;
+      }[];
+    }
+);
+
+export function AccountAbstractionAnalytics(
+  props: AccountAbstractionAnalyticsProps,
+) {
   const [isLoading, startTransition] = useTransition();
 
   const [rangeType, setRangeType] = useQueryState(
@@ -62,6 +79,8 @@ export function AccountAbstractionAnalytics(props: {
     to: rangeType === "custom" ? to : getLastNDaysRange(rangeType).to,
     type: rangeType,
   };
+  const resolvedFrom = range.from;
+  const resolvedTo = range.to;
 
   return (
     <div>
@@ -100,20 +119,23 @@ export function AccountAbstractionAnalytics(props: {
           userOpStats={props.userOpStats}
         />
 
-        <SponsoredTransactionsChartCard
+        <GasMetricsChartCard
           isPending={isLoading}
           userOpStats={props.userOpStats}
         />
 
-        <SponsoredTransactionsTable
-          client={props.client}
-          from={from.toISOString()}
-          projectId={props.projectId}
-          teamId={props.teamId}
-          teamSlug={props.teamSlug}
-          to={to.toISOString()}
-          variant="project"
-        />
+        {resolvedFrom && resolvedTo && (
+          <SponsoredTransactionsTable
+            client={props.client}
+            from={resolvedFrom.toISOString()}
+            teamId={props.teamId}
+            teamSlug={props.teamSlug}
+            to={resolvedTo.toISOString()}
+            {...(props.variant === "project"
+              ? { projectId: props.projectId, variant: "project" as const }
+              : { projects: props.projects, variant: "team" as const })}
+          />
+        )}
       </div>
     </div>
   );

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/factories/AccountFactories/index.tsx

@@ -14,7 +14,6 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { UnderlineLink } from "@/components/ui/UnderlineLink";
 
 export function DefaultFactoriesSection() {
   const data = [
@@ -38,13 +37,6 @@ export function DefaultFactoriesSection() {
         </h3>
         <p className="text-muted-foreground text-sm">
           Ready to use account factories that are pre-deployed on each chain.{" "}
-          <UnderlineLink
-            href="https://playground.thirdweb.com/connect/account-abstraction/connect"
-            rel="noopener noreferrer"
-            target="_blank"
-          >
-            Learn how to use these in your apps
-          </UnderlineLink>
         </p>
       </div>
 

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/factories/AccountFactories/your-factories.tsx

@@ -3,7 +3,7 @@ import Link from "next/link";
 import { Suspense } from "react";
 import { defineChain, getContract, type ThirdwebClient } from "thirdweb";
 import { getCompilerMetadata } from "thirdweb/contract";
-import { getSortedDeployedContracts } from "@/api/project/getSortedDeployedContracts";
+import { getFilteredProjectContracts } from "@/api/project/getSortedDeployedContracts";
 import { ClientOnly } from "@/components/blocks/client-only";
 import { GenericLoadingPage } from "@/components/blocks/skeletons/GenericLoadingPage";
 import { Button } from "@/components/ui/button";
@@ -60,9 +60,9 @@ async function AsyncYourFactories(props: {
   projectSlug: string;
   clientThirdwebClient: ThirdwebClient;
 }) {
-  const deployedContracts = await getSortedDeployedContracts({
+  const deployedContracts = await getFilteredProjectContracts({
     authToken: props.authToken,
-    deploymentType: undefined,
+    type: "non-token-contracts",
     projectId: props.projectId,
     teamId: props.teamId,
   });

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/page.tsx

@@ -1,163 +1,11 @@
-import type { Metadata } from "next";
-import { notFound, redirect } from "next/navigation";
-import type { SearchParams } from "nuqs/server";
-import { getUserOpUsage } from "@/api/analytics";
-import { getAuthToken } from "@/api/auth-token";
-import { getProject } from "@/api/project/projects";
-import { getTeamBySlug } from "@/api/team/get-team";
-import {
-  getLastNDaysRange,
-  type Range,
-} from "@/components/analytics/date-range-selector";
-import { ProjectPage } from "@/components/blocks/project-page/project-page";
-import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { SmartAccountIcon } from "@/icons/SmartAccountIcon";
-import { getAbsoluteUrl } from "@/utils/vercel";
-import { AccountAbstractionSummary } from "./AccountAbstractionAnalytics/AccountAbstractionSummary";
-import { SmartWalletsBillingAlert } from "./Alerts";
-import { AccountAbstractionAnalytics } from "./aa-analytics";
-import { searchParamLoader } from "./search-params";
-
-interface PageParams {
-  team_slug: string;
-  project_slug: string;
-}
+import { redirect } from "next/navigation";
 
+// Redirect old Account Abstraction page to new Sponsored Gas Overview
 export default async function Page(props: {
-  params: Promise<PageParams>;
-  searchParams: Promise<SearchParams>;
-  children: React.ReactNode;
+  params: Promise<{ team_slug: string; project_slug: string }>;
 }) {
-  const [params, searchParams, authToken] = await Promise.all([
-    props.params,
-    searchParamLoader(props.searchParams),
-    getAuthToken(),
-  ]);
-
-  if (!authToken) {
-    notFound();
-  }
-
-  const [team, project] = await Promise.all([
-    getTeamBySlug(params.team_slug),
-    getProject(params.team_slug, params.project_slug),
-  ]);
-
-  if (!team) {
-    redirect("/team");
-  }
-
-  if (!project) {
-    redirect(`/team/${params.team_slug}`);
-  }
-
-  const interval = searchParams.interval ?? "week";
-  const rangeType = searchParams.range || "last-120";
-
-  const range: Range = {
-    from:
-      rangeType === "custom"
-        ? searchParams.from
-        : getLastNDaysRange(rangeType).from,
-    to:
-      rangeType === "custom"
-        ? searchParams.to
-        : getLastNDaysRange(rangeType).to,
-    type: rangeType,
-  };
-
-  const userOpStats = await getUserOpUsage(
-    {
-      from: range.from,
-      period: interval,
-      projectId: project.id,
-      teamId: project.teamId,
-      to: range.to,
-    },
-    authToken,
-  );
-
-  const client = getClientThirdwebClient({
-    jwt: authToken,
-    teamId: project.teamId,
-  });
-
-  const isBundlerServiceEnabled = !!project.services.find(
-    (s) => s.name === "bundler",
-  );
-
-  const hasSmartWalletsWithoutBilling =
-    isBundlerServiceEnabled &&
-    team.billingStatus !== "validPayment" &&
-    team.billingStatus !== "pastDue";
-
-  return (
-    <ProjectPage
-      header={{
-        icon: SmartAccountIcon,
-        client,
-        title: "Account Abstraction",
-        description:
-          "Integrate EIP-7702 and EIP-4337 compliant smart accounts for gasless sponsorships and more.",
-        actions: null,
-        settings: {
-          href: `/team/${params.team_slug}/${params.project_slug}/settings/account-abstraction`,
-        },
-        links: [
-          {
-            type: "docs",
-            href: "https://portal.thirdweb.com/transactions/sponsor",
-          },
-          {
-            type: "playground",
-            href: "https://playground.thirdweb.com/account-abstraction/eip-7702",
-          },
-        ],
-      }}
-    >
-      {hasSmartWalletsWithoutBilling && (
-        <>
-          <SmartWalletsBillingAlert teamSlug={params.team_slug} />
-          <div className="h-10" />
-        </>
-      )}
-      <div className="flex grow flex-col gap-10">
-        <AccountAbstractionSummary
-          projectId={project.id}
-          teamId={project.teamId}
-          authToken={authToken}
-        />
-
-        <AccountAbstractionAnalytics
-          client={client}
-          projectId={project.id}
-          teamId={project.teamId}
-          teamSlug={params.team_slug}
-          userOpStats={userOpStats}
-        />
-      </div>
-    </ProjectPage>
+  const params = await props.params;
+  redirect(
+    `/team/${params.team_slug}/${params.project_slug}/wallets/sponsored-gas`,
   );
 }
-
-const seo = {
-  desc: "Add account abstraction to your web3 app & unlock powerful features for seamless onboarding, customizable transactions, & maximum security. Get started.",
-  title: "The Complete Account Abstraction Toolkit | thirdweb",
-};
-
-export const metadata: Metadata = {
-  description: seo.desc,
-  openGraph: {
-    description: seo.desc,
-    images: [
-      {
-        alt: seo.title,
-        height: 630,
-        url: `${getAbsoluteUrl()}/assets/og-image/dashboard-wallets-smart-wallet.png`,
-        width: 1200,
-      },
-    ],
-    title: seo.title,
-  },
-  title: seo.title,
-};

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/account-abstraction/settings/SponsorshipPolicies/index.tsx

@@ -44,6 +44,7 @@ type AccountAbstractionSettingsPageProps = {
   teamId: string;
   teamSlug: string;
   validTeamPlan: Team["billingPlan"];
+  isLegacyPlan: boolean;
   client: ThirdwebClient;
 };
 
@@ -371,7 +372,7 @@ export function AccountAbstractionSettingsPage(
                         of the{" "}
                         <UnderlineLink
                           className="text-primary-500"
-                          href="https://portal.thirdweb.com/wallets/smart-wallet/infrastructure#supported-chains"
+                          href="https://thirdweb.com/chainlist?service=account-abstraction"
                           rel="noopener noreferrer"
                           target="_blank"
                         >
@@ -565,6 +566,7 @@ export function AccountAbstractionSettingsPage(
                     <GatedSwitch
                       currentPlan={props.validTeamPlan}
                       requiredPlan="starter"
+                      isLegacyPlan={props.isLegacyPlan}
                       switchProps={{
                         checked: field.value.enabled,
                         id: "server-verifier-switch",

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/analytics/chart/AiTokenUsageChartCard.tsx

@@ -1,11 +1,13 @@
 "use client";
 import { format } from "date-fns";
+import { ArrowUpRightIcon } from "lucide-react";
+import Link from "next/link";
 import { useMemo } from "react";
 import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
-import { DocLink } from "@/components/blocks/DocLink";
+import { TotalValueChartHeader } from "@/components/blocks/charts/chart-header";
 import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
+import { Button } from "@/components/ui/button";
 import type { ChartConfig } from "@/components/ui/chart";
-import { NebulaIcon } from "@/icons/NebulaIcon";
 import type { AIUsageStats } from "@/types/analytics";
 
 type ChartData = Record<string, number> & {
@@ -17,7 +19,7 @@ export function AiTokenUsageChartCardUI(props: {
   aiUsageStats: AIUsageStats[];
   isPending: boolean;
   title: string;
-  description: string;
+  viewMoreLink: string | undefined;
 }) {
   const { aiUsageStats } = props;
 
@@ -52,33 +54,43 @@ export function AiTokenUsageChartCardUI(props: {
     chartData.length === 0 ||
     chartData.every((data) => data.tokens === 0);
 
+  const total = useMemo(() => {
+    return chartData.reduce((acc, curr) => acc + curr.tokens, 0);
+  }, [chartData]);
+
   return (
     <ThirdwebBarChart
-      chartClassName="aspect-[1.5] lg:aspect-[3.5]"
+      chartClassName="h-[275px] w-full aspect-auto"
       config={chartConfig}
       customHeader={
-        <div className="relative px-6 pt-6">
-          <h3 className="mb-0.5 font-semibold text-xl tracking-tight">
-            {props.title}
-          </h3>
-          <p className="mb-3 text-muted-foreground text-sm">
-            {props.description}
-          </p>
-
-          <ExportToCSVButton
-            className="top-6 right-6 mb-4 w-full bg-background md:absolute md:mb-0 md:flex md:w-auto"
-            disabled={disableActions}
-            fileName="AI Token Usage"
-            getData={async () => {
-              const header = ["Date", "Tokens"];
-              const rows = chartData.map((data) => [
-                data.time,
-                data.tokens.toString(),
-              ]);
-              return { header, rows };
-            }}
+        props.viewMoreLink ? (
+          <TotalValueChartHeader
+            isPending={props.isPending}
+            total={total}
+            title={props.title}
+            viewMoreLink={props.viewMoreLink}
           />
-        </div>
+        ) : (
+          <div className="relative px-6 pt-6">
+            <h3 className="font-semibold text-xl tracking-tight">
+              {props.title}
+            </h3>
+
+            <ExportToCSVButton
+              className="top-6 right-6 mb-4 w-full bg-background md:absolute md:mb-0 md:flex md:w-auto"
+              disabled={disableActions}
+              fileName="AI Token Usage"
+              getData={async () => {
+                const header = ["Date", "Tokens"];
+                const rows = chartData.map((data) => [
+                  data.time,
+                  data.tokens.toString(),
+                ]);
+                return { header, rows };
+              }}
+            />
+          </div>
+        )
       }
       data={chartData}
       emptyChartState={<AiTokenUsageEmptyChartState />}
@@ -100,17 +112,24 @@ export function AiTokenUsageChartCardUI(props: {
 function AiTokenUsageEmptyChartState() {
   return (
     <div className="flex flex-col items-center justify-center px-4">
-      <span className="mb-6 text-center text-lg">
+      <h3 className="text-base font-semibold text-foreground mb-1 text-center">
+        No data available
+      </h3>
+      <p className="mb-6 text-center text-sm">
         Integrate thirdweb AI to interact with any EVM chain using natural
         language
-      </span>
-      <div className="flex max-w-md flex-wrap items-center justify-center gap-x-6 gap-y-4">
-        <DocLink
-          icon={NebulaIcon}
-          label="Get Started"
-          link="https://portal.thirdweb.com/ai/chat"
-        />
-      </div>
+      </p>
+      <Button
+        asChild
+        size="sm"
+        variant="default"
+        className="rounded-full gap-2"
+      >
+        <Link href="https://portal.thirdweb.com/ai/chat" target="_blank">
+          Get Started
+          <ArrowUpRightIcon className="size-4" />
+        </Link>
+      </Button>
     </div>
   );
 }

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/analytics/chart/index.tsx

@@ -18,9 +18,9 @@ function AiAnalyticsUI({ stats, isPending }: AiAnalyticsProps) {
   return (
     <AiTokenUsageChartCardUI
       title="Token Usage"
-      description="The total number of tokens used for AI interactions on your project."
       aiUsageStats={stats || []}
       isPending={isPending}
+      viewMoreLink={undefined}
     />
   );
 }

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/ai/analytics/page.tsx

@@ -1,3 +1,4 @@
+import { BotIcon } from "lucide-react";
 import { redirect } from "next/navigation";
 import { ResponsiveSearchParamsProvider } from "responsive-rsc";
 import { getAuthToken } from "@/api/auth-token";
@@ -6,7 +7,6 @@ import type { DurationId } from "@/components/analytics/date-range-selector";
 import { ResponsiveTimeFilters } from "@/components/analytics/responsive-time-filters";
 import { ProjectPage } from "@/components/blocks/project-page/project-page";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { NebulaIcon } from "@/icons/NebulaIcon";
 import { getFiltersFromSearchParams } from "@/lib/time";
 import { loginRedirect } from "@/utils/redirects";
 import { AiAnalytics } from "./chart";
@@ -58,7 +58,7 @@ export default async function Page(props: {
     <ResponsiveSearchParamsProvider value={searchParams}>
       <ProjectPage
         header={{
-          icon: NebulaIcon,
+          icon: BotIcon,
           client,
           title: "AI Analytics",
           description: "Track your AI app usage and performance",