Version Packages (#7568)

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

.github/workflows/CI.yml

@@ -63,7 +63,7 @@ jobs:
       - name: Setup Biome
         uses: biomejs/setup-biome@a9763ed3d2388f5746f9dc3e1a55df7f4609bc89 # v2.5.1
         with:
-          version: 2.0.4 
+          version: 2.0.6
 
       - run: pnpm lint
 

apps/dashboard/biome.json

@@ -1,4 +1,4 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.0.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
   "extends": "//"
 }

apps/dashboard/framer-rewrites.js

@@ -14,12 +14,15 @@ module.exports = [
   "/in-app-wallets",
   "/transactions",
   // -- end build category
-  // -- storage
+
+  // -- scale category
+  "/rpc",
+  "/insight",
   "/storage",
+  // -- end scale category
+
   // -- nebula
   "/nebula",
-  // --insight
-  "/insight",
   // -- contracts
   "/contracts",
   "/contracts/modular-contracts",

apps/dashboard/next.config.ts

@@ -208,35 +208,29 @@ function getConfig(): NextConfig {
     const withBundleAnalyzer = require("@next/bundle-analyzer")({
       enabled: process.env.ANALYZE === "true",
     });
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { withPlausibleProxy } = require("next-plausible");
+
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const { withSentryConfig } = require("@sentry/nextjs");
     return withBundleAnalyzer(
-      withPlausibleProxy({
-        customDomain: "https://pl.thirdweb.com",
-        scriptName: "pl",
-      })(
-        withSentryConfig(
-          {
-            ...baseNextConfig,
-            // @ts-expect-error - this is a valid option
-            webpack: (config) => {
-              if (config.cache) {
-                config.cache = Object.freeze({
-                  type: "memory",
-                });
-              }
-              config.module = {
-                ...config.module,
-                exprContextCritical: false,
-              };
-              // Important: return the modified config
-              return config;
-            },
+      withSentryConfig(
+        {
+          ...baseNextConfig,
+          // @ts-expect-error - this is a valid option
+          webpack: (config) => {
+            if (config.cache) {
+              config.cache = Object.freeze({
+                type: "memory",
+              });
+            }
+            config.module = {
+              ...config.module,
+              exprContextCritical: false,
+            };
+            // Important: return the modified config
+            return config;
           },
-          SENTRY_OPTIONS,
-        ),
+        },
+        SENTRY_OPTIONS,
       ),
     );
   }

apps/dashboard/package.json

@@ -4,13 +4,14 @@
     "@chakra-ui/styled-system": "^2.9.2",
     "@chakra-ui/theme-tools": "^2.1.2",
     "@emotion/react": "11.14.0",
-    "@emotion/styled": "11.14.0",
+    "@emotion/styled": "11.14.1",
     "@hookform/resolvers": "^3.9.1",
     "@marsidev/react-turnstile": "^1.1.0",
     "@radix-ui/react-accordion": "^1.2.11",
     "@radix-ui/react-alert-dialog": "^1.1.14",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-checkbox": "^1.3.2",
+    "@radix-ui/react-collapsible": "^1.1.11",
     "@radix-ui/react-dialog": "1.1.14",
     "@radix-ui/react-dropdown-menu": "^2.1.15",
     "@radix-ui/react-hover-card": "^1.1.14",
@@ -23,14 +24,14 @@
     "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-switch": "^1.2.5",
     "@radix-ui/react-tooltip": "1.2.7",
-    "@scalar/api-reference-react": "^0.6.19",
-    "@sentry/nextjs": "9.29.0",
+    "@scalar/api-reference-react": "0.7.25",
+    "@sentry/nextjs": "9.34.0",
     "@shazow/whatsabi": "0.22.2",
-    "@tanstack/react-query": "5.80.7",
+    "@tanstack/react-query": "5.81.5",
     "@tanstack/react-table": "^8.21.3",
     "@thirdweb-dev/service-utils": "workspace:*",
     "@thirdweb-dev/vault-sdk": "workspace:*",
-    "@vercel/functions": "2.1.0",
+    "@vercel/functions": "2.2.2",
     "@vercel/og": "^0.6.8",
     "abitype": "1.0.8",
     "chakra-react-select": "^4.7.6",
@@ -40,29 +41,28 @@
     "compare-versions": "^6.1.0",
     "date-fns": "4.1.0",
     "fast-xml-parser": "^5.2.5",
-    "framer-motion": "12.17.0",
+    "framer-motion": "12.23.0",
     "fuse.js": "7.1.0",
     "input-otp": "^1.4.1",
     "ioredis": "^5.6.1",
     "ipaddr.js": "^2.2.0",
-    "lucide-react": "0.514.0",
-    "next": "15.3.3",
-    "next-plausible": "^3.12.4",
+    "lucide-react": "0.525.0",
+    "next": "15.3.5",
     "next-themes": "^0.4.6",
     "nextjs-toploader": "^1.6.12",
     "nuqs": "^2.4.3",
     "p-limit": "^6.2.0",
     "papaparse": "^5.5.3",
     "pluralize": "^8.0.0",
-    "posthog-js": "1.252.0",
-    "prettier": "3.5.3",
+    "posthog-js": "1.256.1",
+    "prettier": "3.6.2",
     "qrcode": "^1.5.3",
     "react": "19.1.0",
     "react-children-utilities": "^2.10.0",
     "react-day-picker": "^8.10.1",
     "react-dom": "19.1.0",
     "react-dropzone": "^14.3.8",
-    "react-error-boundary": "^5.0.0",
+    "react-error-boundary": "6.0.0",
     "react-hook-form": "7.55.0",
     "react-markdown": "10.1.0",
     "react-table": "^7.8.0",
@@ -71,7 +71,7 @@
     "responsive-rsc": "0.0.7",
     "server-only": "^0.0.1",
     "shiki": "1.27.0",
-    "sonner": "2.0.5",
+    "sonner": "2.0.6",
     "spdx-correct": "^3.2.0",
     "stripe": "17.7.0",
     "swagger-ui-react": "^5.24.1",
@@ -81,19 +81,19 @@
     "tiny-invariant": "^1.3.3",
     "use-debounce": "^10.0.5",
     "vaul": "^1.1.2",
-    "zod": "3.25.67"
+    "zod": "3.25.75"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.0.4",
+    "@biomejs/biome": "2.0.6",
     "@chakra-ui/cli": "^2.4.1",
-    "@chromatic-com/storybook": "4.0.0",
-    "@next/bundle-analyzer": "15.3.3",
-    "@next/eslint-plugin-next": "15.3.3",
-    "@playwright/test": "1.53.0",
-    "@storybook/addon-docs": "9.0.8",
-    "@storybook/addon-links": "9.0.8",
-    "@storybook/addon-onboarding": "9.0.8",
-    "@storybook/nextjs": "9.0.8",
+    "@chromatic-com/storybook": "4.0.1",
+    "@next/bundle-analyzer": "15.3.5",
+    "@next/eslint-plugin-next": "15.3.5",
+    "@playwright/test": "1.53.2",
+    "@storybook/addon-docs": "9.0.15",
+    "@storybook/addon-links": "9.0.15",
+    "@storybook/addon-onboarding": "9.0.15",
+    "@storybook/nextjs": "9.0.15",
     "@types/color": "4.2.0",
     "@types/node": "22.14.1",
     "@types/papaparse": "^5.3.16",
@@ -107,15 +107,15 @@
     "@typescript-eslint/eslint-plugin": "7.14.1",
     "@typescript-eslint/parser": "7.14.1",
     "autoprefixer": "^10.4.21",
-    "checkly": "5.6.0",
+    "checkly": "6.0.1",
     "eslint": "8.57.0",
     "eslint-config-biome": "1.9.4",
     "eslint-plugin-react-compiler": "19.1.0-rc.2",
-    "eslint-plugin-storybook": "9.0.8",
+    "eslint-plugin-storybook": "9.0.15",
     "knip": "5.60.2",
     "next-sitemap": "^4.2.3",
-    "postcss": "8.5.5",
-    "storybook": "9.0.8",
+    "postcss": "8.5.6",
+    "storybook": "9.0.15",
     "tailwindcss": "3.4.17",
     "typescript": "5.8.3"
   },

apps/dashboard/redirects.js

@@ -106,9 +106,27 @@ const projectPageRedirects = [
     source: `${projectRoute}/nebula/:path*`,
   },
   {
-    source: `${projectRoute}/connect/analytics`,
     destination: `${projectRoute}`,
     permanent: false,
+    source: `${projectRoute}/connect/analytics`,
+  },
+];
+
+const teamPageRedirects = [
+  {
+    destination: "/team/:team_slug/~/billing/:path*",
+    permanent: false,
+    source: "/team/:team_slug/~/settings/billing/:path*",
+  },
+  {
+    destination: "/team/:team_slug/~/billing/invoices/:path*",
+    permanent: false,
+    source: "/team/:team_slug/~/settings/invoices/:path*",
+  },
+  {
+    destination: "/team/:team_slug/~/billing",
+    permanent: false,
+    source: "/team/:team_slug/~/settings/credits",
   },
 ];
 
@@ -309,13 +327,6 @@ async function redirects() {
       permanent: false,
       source: "/solutions/chains",
     },
-    // redirect /rpc to portal
-    {
-      destination:
-        "https://portal.thirdweb.com/infrastructure/rpc-edge/overview",
-      permanent: false,
-      source: "/rpc-edge",
-    },
     // redirect /sdk to portal
     {
       destination: "https://portal.thirdweb.com/connect/blockchain-api",
@@ -424,8 +435,14 @@ async function redirects() {
       permanent: false,
       source: "/engine",
     },
+    {
+      destination: "/rpc",
+      permanent: false,
+      source: "/rpc-edge",
+    },
     ...legacyDashboardToTeamRedirects,
     ...projectPageRedirects,
+    ...teamPageRedirects,
   ];
 }
 

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

@@ -1,7 +1,10 @@
 "use server";
+import "server-only";
 
 import { getAuthToken } from "@/api/auth-token";
 import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import type { ChainInfraSKU } from "@/types/billing";
+import { getAbsoluteUrl } from "@/utils/vercel";
 
 export async function reSubscribePlan(options: {
   teamId: string;
@@ -14,7 +17,10 @@ export async function reSubscribePlan(options: {
   }
 
   const res = await fetch(
-    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamId}/checkout/resubscribe-plan`,
+    new URL(
+      `/v1/teams/${options.teamId}/checkout/resubscribe-plan`,
+      NEXT_PUBLIC_THIRDWEB_API_HOST,
+    ),
     {
       body: JSON.stringify({}),
       headers: {
@@ -35,3 +41,83 @@ export async function reSubscribePlan(options: {
     status: 200,
   };
 }
+
+export async function getChainInfraCheckoutURL(options: {
+  teamSlug: string;
+  skus: ChainInfraSKU[];
+  chainId: number;
+  annual: boolean;
+}) {
+  const token = await getAuthToken();
+
+  if (!token) {
+    return {
+      error: "You are not logged in",
+      status: "error",
+    } as const;
+  }
+
+  const res = await fetch(
+    new URL(
+      `/v1/teams/${options.teamSlug}/checkout/create-link`,
+      NEXT_PUBLIC_THIRDWEB_API_HOST,
+    ),
+    {
+      body: JSON.stringify({
+        annual: options.annual,
+        baseUrl: getAbsoluteUrl(),
+        chainId: options.chainId,
+        skus: options.skus,
+      }),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+    },
+  );
+  if (!res.ok) {
+    const text = await res.text();
+    console.error("Failed to create checkout link", text, res.status);
+    switch (res.status) {
+      case 402: {
+        return {
+          error:
+            "You have outstanding invoices, please pay these first before re-subscribing.",
+          status: "error",
+        } as const;
+      }
+      case 429: {
+        return {
+          error: "Too many requests, please try again later.",
+          status: "error",
+        } as const;
+      }
+      case 403: {
+        return {
+          error: "You are not authorized to deploy infrastructure.",
+          status: "error",
+        } as const;
+      }
+      default: {
+        return {
+          error: "An unknown error occurred, please try again later.",
+          status: "error",
+        } as const;
+      }
+    }
+  }
+
+  const json = await res.json();
+  if (!json.result) {
+    return {
+      error: "An unknown error occurred, please try again later.",
+      status: "error",
+    } as const;
+  }
+
+  return {
+    data: json.result as string,
+    status: "success",
+  } as const;
+}

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

@@ -1,6 +1,7 @@
 import posthog from "posthog-js";
 
 import type { Team } from "@/api/team";
+import type { ProductSKU } from "../types/billing";
 
 // ----------------------------
 // CONTRACTS
@@ -361,7 +362,11 @@ export function reportAssetCreationFailed(
   properties: { contractType: AssetContractType; error: string } & (
     | {
         assetType: "nft";
-        step: "deploy-contract" | "mint-nfts" | "set-claim-conditions";
+        step:
+          | "deploy-contract"
+          | "mint-nfts"
+          | "set-claim-conditions"
+          | "set-admins";
       }
     | {
         assetType: "coin";
@@ -380,3 +385,31 @@ export function reportAssetCreationFailed(
     step: properties.step,
   });
 }
+
+type UpsellParams = {
+  content: "storage-limit";
+  campaign: "create-coin" | "create-nft";
+  sku: Exclude<ProductSKU, null>;
+};
+
+/**
+ * ### Why do we need to report this event?
+ * - To track how effective the upsells are in driving users to upgrade
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportUpsellShown(properties: UpsellParams) {
+  posthog.capture("upsell shown", properties);
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track how effective the upsells are in driving users to upgrade
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportUpsellClicked(properties: UpsellParams) {
+  posthog.capture("upsell clicked", properties);
+}

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

@@ -6,7 +6,6 @@ import type {
   EcosystemWalletStats,
   EngineCloudStats,
   InAppWalletStats,
-  RpcMethodStats,
   TransactionStats,
   UniversalBridgeStats,
   UniversalBridgeWalletStats,
@@ -17,6 +16,41 @@ import type {
 import { getAuthToken } from "./auth-token";
 import { getChains } from "./chain";
 
+export interface InsightChainStats {
+  date: string;
+  chainId: string;
+  totalRequests: number;
+}
+
+export interface InsightStatusCodeStats {
+  date: string;
+  httpStatusCode: number;
+  totalRequests: number;
+}
+
+export interface InsightEndpointStats {
+  date: string;
+  endpoint: string;
+  totalRequests: number;
+}
+
+interface InsightUsageStats {
+  date: string;
+  totalRequests: number;
+}
+
+export interface RpcMethodStats {
+  date: string;
+  evmMethod: string;
+  count: number;
+}
+
+export interface RpcUsageTypeStats {
+  date: string;
+  usageType: string;
+  count: number;
+}
+
 async function fetchAnalytics(
   input: string | URL,
   init?: RequestInit,
@@ -76,6 +110,9 @@ function buildSearchParams(params: AnalyticsQueryParams): URLSearchParams {
   if (params.period) {
     searchParams.append("period", params.period);
   }
+  if (params.limit) {
+    searchParams.append("limit", params.limit.toString());
+  }
   return searchParams;
 }
 
@@ -225,6 +262,26 @@ export async function getRpcMethodUsage(
   return json.data as RpcMethodStats[];
 }
 
+export async function getRpcUsageByType(
+  params: AnalyticsQueryParams,
+): Promise<RpcUsageTypeStats[]> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/rpc/usage-types?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    console.error("Failed to fetch RPC usage");
+    return [];
+  }
+
+  const json = await res.json();
+  return json.data as RpcUsageTypeStats[];
+}
+
 export async function getWalletUsers(
   params: AnalyticsQueryParams,
 ): Promise<WalletUserStats[]> {
@@ -424,3 +481,91 @@ export async function getEngineCloudMethodUsage(
   const json = await res.json();
   return json.data as EngineCloudStats[];
 }
+
+export async function getInsightChainUsage(
+  params: AnalyticsQueryParams,
+): Promise<{ data: InsightChainStats[] } | { errorMessage: string }> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/insight/usage/by-chain?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    const reason = await res?.text();
+    const errMsg = `Failed to fetch Insight chain usage: ${res?.status} - ${res.statusText} - ${reason}`;
+    console.error(errMsg);
+    return { errorMessage: errMsg };
+  }
+
+  const json = await res.json();
+  return { data: json.data as InsightChainStats[] };
+}
+
+export async function getInsightStatusCodeUsage(
+  params: AnalyticsQueryParams,
+): Promise<{ data: InsightStatusCodeStats[] } | { errorMessage: string }> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/insight/usage/by-status-code?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    const reason = await res?.text();
+    const errMsg = `Failed to fetch Insight status code usage: ${res?.status} - ${res.statusText} - ${reason}`;
+    console.error(errMsg);
+    return { errorMessage: errMsg };
+  }
+
+  const json = await res.json();
+  return { data: json.data as InsightStatusCodeStats[] };
+}
+
+export async function getInsightEndpointUsage(
+  params: AnalyticsQueryParams,
+): Promise<{ data: InsightEndpointStats[] } | { errorMessage: string }> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/insight/usage/by-endpoint?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    const reason = await res?.text();
+    const errMsg = `Failed to fetch Insight endpoint usage: ${res?.status} - ${res.statusText} - ${reason}`;
+    console.error(errMsg);
+    return { errorMessage: errMsg };
+  }
+
+  const json = await res.json();
+  return { data: json.data as InsightEndpointStats[] };
+}
+
+export async function getInsightUsage(
+  params: AnalyticsQueryParams,
+): Promise<{ data: InsightUsageStats[] } | { errorMessage: string }> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/insight/usage?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    const reason = await res?.text();
+    const errMsg = `Failed to fetch Insight usage: ${res?.status} - ${res.statusText} - ${reason}`;
+    console.error(errMsg);
+    return { errorMessage: errMsg };
+  }
+
+  const json = await res.json();
+  return { data: json.data as InsightUsageStats[] };
+}

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

@@ -1,22 +1,26 @@
-export const authOptions = [
-  "email",
-  "phone",
-  "passkey",
-  "siwe",
-  "guest",
-  "google",
-  "facebook",
-  "x",
-  "discord",
-  "farcaster",
-  "telegram",
-  "github",
-  "twitch",
-  "steam",
-  "apple",
-  "coinbase",
-  "line",
-] as const;
+import "server-only";
+
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { getAuthToken } from "./auth-token";
+
+export type AuthOption =
+  | "email"
+  | "phone"
+  | "passkey"
+  | "siwe"
+  | "guest"
+  | "google"
+  | "facebook"
+  | "x"
+  | "discord"
+  | "farcaster"
+  | "telegram"
+  | "github"
+  | "twitch"
+  | "steam"
+  | "apple"
+  | "coinbase"
+  | "line";
 
 export type Ecosystem = {
   name: string;
@@ -24,7 +28,7 @@ export type Ecosystem = {
   id: string;
   slug: string;
   permission: "PARTNER_WHITELIST" | "ANYONE";
-  authOptions: (typeof authOptions)[number][];
+  authOptions: AuthOption[];
   customAuthOptions?: {
     authEndpoint?: {
       url: string;
@@ -47,6 +51,54 @@ export type Ecosystem = {
   updatedAt: string;
 };
 
+export async function fetchEcosystemList(teamIdOrSlug: string) {
+  const token = await getAuthToken();
+
+  if (!token) {
+    return [];
+  }
+
+  const res = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${teamIdOrSlug}/ecosystem-wallet`,
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    },
+  );
+
+  if (!res.ok) {
+    return [];
+  }
+
+  return (await res.json()).result as Ecosystem[];
+}
+
+export async function fetchEcosystem(slug: string, teamIdOrSlug: string) {
+  const token = await getAuthToken();
+
+  if (!token) {
+    return null;
+  }
+
+  const res = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${teamIdOrSlug}/ecosystem-wallet/${slug}`,
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    },
+  );
+  if (!res.ok) {
+    const data = await res.json();
+    console.error(data);
+    return null;
+  }
+
+  const data = (await res.json()) as { result: Ecosystem };
+  return data.result;
+}
+
 type PartnerPermission = "PROMPT_USER_V1" | "FULL_CONTROL_V1";
 export type Partner = {
   id: string;

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

@@ -1,6 +1,6 @@
 import { getAuthToken } from "@/api/auth-token";
 import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
-import type { ProductSKU } from "@/types/billing";
+import type { ChainInfraSKU, ProductSKU } from "@/types/billing";
 
 type InvoiceLine = {
   // amount for this line item
@@ -22,7 +22,7 @@ type Invoice = {
 
 export type TeamSubscription = {
   id: string;
-  type: "PLAN" | "USAGE" | "PLAN_ADD_ON" | "PRODUCT";
+  type: "PLAN" | "USAGE" | "PLAN_ADD_ON" | "PRODUCT" | "CHAIN";
   status:
     | "incomplete"
     | "incomplete_expired"
@@ -37,6 +37,13 @@ export type TeamSubscription = {
   trialStart: string | null;
   trialEnd: string | null;
   upcomingInvoice: Invoice;
+  skus: (ProductSKU | ChainInfraSKU)[];
+};
+
+type ChainTeamSubscription = Omit<TeamSubscription, "skus"> & {
+  chainId: string;
+  skus: ChainInfraSKU[];
+  isLegacy: boolean;
 };
 
 export async function getTeamSubscriptions(slug: string) {
@@ -60,3 +67,61 @@ export async function getTeamSubscriptions(slug: string) {
   }
   return null;
 }
+
+const CHAIN_PLAN_TO_INFRA = {
+  "chain:plan:gold": ["chain:infra:rpc", "chain:infra:account_abstraction"],
+  "chain:plan:platinum": [
+    "chain:infra:rpc",
+    "chain:infra:insight",
+    "chain:infra:account_abstraction",
+  ],
+  "chain:plan:ultimate": [
+    "chain:infra:rpc",
+    "chain:infra:insight",
+    "chain:infra:account_abstraction",
+  ],
+};
+
+export async function getChainSubscriptions(slug: string) {
+  const allSubscriptions = await getTeamSubscriptions(slug);
+  if (!allSubscriptions) {
+    return null;
+  }
+
+  // first replace any sku that MIGHT match a chain plan
+  const updatedSubscriptions = allSubscriptions
+    .filter((s) => s.type === "CHAIN")
+    .map((s) => {
+      const skus = s.skus;
+      const updatedSkus = skus.flatMap((sku) => {
+        const plan =
+          CHAIN_PLAN_TO_INFRA[sku as keyof typeof CHAIN_PLAN_TO_INFRA];
+        return plan ? plan : sku;
+      });
+      return {
+        ...s,
+        isLegacy: updatedSkus.length !== skus.length,
+        skus: updatedSkus,
+      };
+    });
+
+  return updatedSubscriptions.filter(
+    (s): s is ChainTeamSubscription =>
+      "chainId" in s && typeof s.chainId === "string",
+  );
+}
+
+export async function getChainSubscriptionForChain(
+  slug: string,
+  chainId: number,
+) {
+  const chainSubscriptions = await getChainSubscriptions(slug);
+
+  if (!chainSubscriptions) {
+    return null;
+  }
+
+  return (
+    chainSubscriptions.find((s) => s.chainId === chainId.toString()) ?? null
+  );
+}

apps/dashboard/src/@/components/analytics/date-range-selector.tsx

@@ -8,11 +8,13 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { normalizeTime } from "@/lib/time";
+import { cn } from "@/lib/utils";
 
 export function DateRangeSelector(props: {
   range: Range;
   setRange: (range: Range) => void;
   popoverAlign?: "start" | "end" | "center";
+  className?: string;
 }) {
   const { range, setRange } = props;
   const daysDiff = differenceInCalendarDays(range.to, range.from);
@@ -26,7 +28,7 @@ export function DateRangeSelector(props: {
 
   return (
     <DatePickerWithRange
-      className="w-auto bg-card"
+      className={cn("w-auto bg-card", props.className)}
       from={range.from}
       header={
         <div className="mb-2 border-border border-b p-4">

apps/dashboard/src/@/components/analytics/range-selector.tsx

@@ -76,8 +76,9 @@ export function RangeSelector({
   });
 
   return (
-    <div className="flex justify-end gap-4">
+    <div className="flex justify-end gap-3 flex-col lg:flex-row">
       <DateRangeSelector
+        className="rounded-full"
         range={localRange}
         setRange={(newRange) => {
           setRange(newRange);
@@ -89,7 +90,7 @@ export function RangeSelector({
         }}
       />
       <IntervalSelector
-        className="bg-card"
+        className="bg-card rounded-full"
         intervalType={localInterval}
         setIntervalType={(newInterval) => {
           setInterval(newInterval);

apps/dashboard/src/@/components/billing/CancelPlanModal/CancelPlanModal.tsx

@@ -82,7 +82,7 @@ function UnpaidInvoicesWarning({ teamSlug }: { teamSlug: string }) {
 
       <Button asChild className="w-full gap-2 bg-card" variant="outline">
         <Link
-          href={`/team/${teamSlug}/~/settings/invoices?status=open`}
+          href={`/team/${teamSlug}/~/billing/invoices?status=open`}
           rel="noopener noreferrer"
           target="_blank"
         >

apps/dashboard/src/@/components/billing/billing.tsx

@@ -60,7 +60,7 @@ function BillingWarning({ teamSlug }: { teamSlug: string }) {
         You have outstanding invoices. Please{" "}
         <Link
           className="font-medium text-amber-700 underline transition-colors hover:text-amber-900 dark:text-amber-400 dark:hover:text-amber-300"
-          href={`/team/${teamSlug}/~/settings/invoices?status=open`}
+          href={`/team/${teamSlug}/~/billing/invoices?status=open`}
         >
           pay them
         </Link>{" "}

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

@@ -44,7 +44,7 @@ export const GatedSwitch: React.FC<GatedSwitchProps> = (
             <div className="flex w-full flex-col gap-2">
               <Button asChild className="justify-start gap-2" size="sm">
                 <Link
-                  href={`/team/${props.teamSlug}/~/settings/billing?showPlans=true&highlight=${props.requiredPlan}`}
+                  href={`/team/${props.teamSlug}/~/billing?showPlans=true&highlight=${props.requiredPlan}`}
                   rel="noopener noreferrer"
                   target="_blank"
                 >

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

@@ -53,7 +53,7 @@ export function MobileSidebar(props: {
   );
 }
 
-export function useActiveSidebarLink(links: SidebarLink[]) {
+function useActiveSidebarLink(links: SidebarLink[]) {
   const pathname = usePathname();
 
   const activeLink = useMemo(() => {

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

@@ -152,6 +152,7 @@ export function SingleNetworkSelector(props: {
   disableChainId?: boolean;
   align?: "center" | "start" | "end";
   disableTestnets?: boolean;
+  disableDeprecated?: boolean;
   placeholder?: string;
   client: ThirdwebClient;
 }) {
@@ -169,8 +170,17 @@ export function SingleNetworkSelector(props: {
       chains = chains.filter((chain) => chainIdSet.has(chain.chainId));
     }
 
+    if (props.disableDeprecated) {
+      chains = chains.filter((chain) => chain.status !== "deprecated");
+    }
+
     return chains;
-  }, [allChains, props.chainIds, props.disableTestnets]);
+  }, [
+    allChains,
+    props.chainIds,
+    props.disableTestnets,
+    props.disableDeprecated,
+  ]);
 
   const options = useMemo(() => {
     return chainsToShow.map((chain) => {

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

@@ -1,24 +1,7 @@
-import {
-  Sidebar,
-  SidebarContent,
-  SidebarFooter,
-  SidebarGroup,
-  SidebarGroupContent,
-  SidebarGroupLabel,
-  SidebarMenu,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  SidebarMenuSubItem,
-  SidebarRail,
-  SidebarSeparator,
-  SidebarTrigger,
-  useSidebar,
-} from "@/components/ui/sidebar";
+"use client";
+
 import { cn } from "../../lib/utils";
-import { AppFooter } from "../footers/app-footer";
-import { NavLink } from "../ui/NavLink";
-import { Separator } from "../ui/separator";
-import { MobileSidebar, useActiveSidebarLink } from "./MobileSidebar";
+import { MobileSidebar } from "./MobileSidebar";
 import { CustomSidebar, type SidebarLink } from "./Sidebar";
 
 export function SidebarLayout(props: {
@@ -51,129 +34,3 @@ export function SidebarLayout(props: {
     </div>
   );
 }
-
-export function FullWidthSidebarLayout(props: {
-  contentSidebarLinks: SidebarLink[];
-  footerSidebarLinks?: SidebarLink[];
-  children: React.ReactNode;
-  className?: string;
-}) {
-  const { contentSidebarLinks, children, footerSidebarLinks } = props;
-  return (
-    <div
-      className={cn(
-        "relative flex w-full flex-1 overflow-y-hidden",
-        props.className,
-      )}
-    >
-      {/* left - sidebar */}
-      <Sidebar className="pt-2" collapsible="icon" side="left">
-        <SidebarContent className="p-2">
-          <RenderSidebarMenu links={contentSidebarLinks} />
-        </SidebarContent>
-
-        {footerSidebarLinks && (
-          <SidebarFooter className="pb-3">
-            <RenderSidebarMenu links={footerSidebarLinks} />
-          </SidebarFooter>
-        )}
-
-        <SidebarRail />
-      </Sidebar>
-
-      {/* right - content */}
-      <div className="flex h-full flex-grow flex-col overflow-y-auto">
-        <MobileSidebarTrigger
-          links={[...contentSidebarLinks, ...(footerSidebarLinks || [])]}
-        />
-
-        <main className="flex min-w-0 grow flex-col max-sm:w-full">
-          {children}
-        </main>
-        <AppFooter containerClassName="max-w-7xl" />
-      </div>
-    </div>
-  );
-}
-
-function RenderSidebarGroup(props: {
-  sidebarLinks: SidebarLink[];
-  groupName: string;
-}) {
-  return (
-    <SidebarGroup className="p-0">
-      <SidebarMenuItem>
-        <SidebarGroupLabel> {props.groupName}</SidebarGroupLabel>
-        <SidebarGroupContent>
-          <RenderSidebarMenu links={props.sidebarLinks} />
-        </SidebarGroupContent>
-      </SidebarMenuItem>
-    </SidebarGroup>
-  );
-}
-
-function RenderSidebarMenu(props: { links: SidebarLink[] }) {
-  const sidebar = useSidebar();
-  return (
-    <SidebarMenu className="gap-1.5">
-      {props.links.map((link, idx) => {
-        // link
-        if ("href" in link) {
-          return (
-            <SidebarMenuSubItem key={link.href}>
-              <SidebarMenuButton asChild>
-                <NavLink
-                  activeClassName="text-foreground bg-accent"
-                  className="flex items-center gap-2 text-muted-foreground text-sm hover:bg-accent"
-                  exactMatch={link.exactMatch}
-                  href={link.href}
-                  isActive={link.isActive}
-                  onClick={() => {
-                    sidebar.setOpenMobile(false);
-                  }}
-                >
-                  {link.icon && <link.icon className="size-4" />}
-                  <span>{link.label}</span>
-                </NavLink>
-              </SidebarMenuButton>
-            </SidebarMenuSubItem>
-          );
-        }
-
-        // separator
-        if ("separator" in link) {
-          return (
-            <SidebarSeparator
-              className="my-1"
-              key={`separator-${
-                // biome-ignore lint/suspicious/noArrayIndexKey: index is fine here
-                idx
-              }`}
-            />
-          );
-        }
-
-        // group
-        return (
-          <RenderSidebarGroup
-            groupName={link.group}
-            key={link.group}
-            sidebarLinks={link.links}
-          />
-        );
-      })}
-    </SidebarMenu>
-  );
-}
-
-function MobileSidebarTrigger(props: { links: SidebarLink[] }) {
-  const activeLink = useActiveSidebarLink(props.links);
-
-  return (
-    <div className="flex items-center gap-3 border-b px-4 py-4 lg:hidden">
-      <SidebarTrigger className="size-4" />
-      <Separator className="h-4" orientation="vertical" />
-      {activeLink && <span className="text-sm">{activeLink.label}</span>}
-    </div>
-  );
-}

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

@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/a11y/useSemanticElements: FIXME */
 "use client";
 
 import {
@@ -164,7 +165,6 @@ export function TWTable<TRowData>(tableProps: TWTableProps<TRowData>) {
             return (
               <TableRow
                 key={row.id}
-                // biome-ignore lint/a11y/useSemanticElements: FIXME
                 role="group"
                 {...(tableProps.onRowClick
                   ? {

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

@@ -45,7 +45,7 @@ export function TeamPlanBadge(props: {
     }
     e.stopPropagation();
     e.preventDefault();
-    router.push(`/team/${props.teamSlug}/~/settings/billing?showPlans=true`);
+    router.push(`/team/${props.teamSlug}/~/billing?showPlans=true`);
   }
 
   return (

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

@@ -38,12 +38,18 @@ const ACCENT = {
 type UpsellBannerCardProps = {
   title: React.ReactNode;
   description: React.ReactNode;
-  cta: {
-    text: React.ReactNode;
-    icon?: React.ReactNode;
-    target?: "_blank";
-    link: string;
-  };
+  cta?:
+    | {
+        text: React.ReactNode;
+        icon?: React.ReactNode;
+        target?: "_blank";
+        link: string;
+      }
+    | {
+        text: React.ReactNode;
+        icon?: React.ReactNode;
+        onClick: () => void;
+      };
   accentColor?: keyof typeof ACCENT;
   icon?: React.ReactNode;
 };
@@ -93,25 +99,41 @@ export function UpsellBannerCard(props: UpsellBannerCardProps) {
           </div>
         </div>
 
-        <Button
-          asChild
-          className={cn(
-            "mt-2 gap-2 hover:translate-y-0 hover:shadow-inner sm:mt-0",
-            color.btn,
-          )}
-          size="sm"
-        >
-          <Link
-            href={props.cta.link}
-            rel={
-              props.cta.target === "_blank" ? "noopener noreferrer" : undefined
-            }
-            target={props.cta.target}
+        {props.cta && "target" in props.cta ? (
+          <Button
+            asChild
+            className={cn(
+              "mt-2 gap-2 hover:translate-y-0 hover:shadow-inner sm:mt-0",
+              color.btn,
+            )}
+            size="sm"
+          >
+            <Link
+              href={props.cta.link}
+              rel={
+                props.cta.target === "_blank"
+                  ? "noopener noreferrer"
+                  : undefined
+              }
+              target={props.cta.target}
+            >
+              {props.cta.text}
+              {props.cta.icon && <span className="ml-2">{props.cta.icon}</span>}
+            </Link>
+          </Button>
+        ) : props.cta && "onClick" in props.cta ? (
+          <Button
+            className={cn(
+              "mt-2 gap-2 hover:translate-y-0 hover:shadow-inner sm:mt-0",
+              color.btn,
+            )}
+            onClick={props.cta.onClick}
+            size="sm"
           >
             {props.cta.text}
             {props.cta.icon && <span className="ml-2">{props.cta.icon}</span>}
-          </Link>
-        </Button>
+          </Button>
+        ) : null}
       </div>
     </div>
   );

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

@@ -0,0 +1,304 @@
+"use client";
+
+import { ChevronDownIcon, ChevronRightIcon } from "lucide-react";
+import { usePathname } from "next/navigation";
+import { useMemo } from "react";
+import { AppFooter } from "@/components/footers/app-footer";
+import {
+  Collapsible,
+  CollapsibleContent,
+  CollapsibleTrigger,
+} from "@/components/ui/collapsible";
+import { DynamicHeight } from "@/components/ui/DynamicHeight";
+import { NavLink } from "@/components/ui/NavLink";
+import { Separator } from "@/components/ui/separator";
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSub,
+  SidebarMenuSubItem,
+  SidebarRail,
+  SidebarSeparator,
+  SidebarTrigger,
+  useSidebar,
+} from "@/components/ui/sidebar";
+import { cn } from "@/lib/utils";
+
+type ShadcnSidebarBaseLink = {
+  href: string;
+  label: React.ReactNode;
+  exactMatch?: boolean;
+  icon?: React.FC<{ className?: string }>;
+  isActive?: (pathname: string) => boolean;
+};
+
+type ShadcnSidebarLink =
+  | ShadcnSidebarBaseLink
+  | {
+      group: string;
+      links: ShadcnSidebarBaseLink[];
+    }
+  | {
+      separator: true;
+    }
+  | {
+      subMenu: Omit<ShadcnSidebarBaseLink, "href" | "exactMatch">;
+      links: Omit<ShadcnSidebarBaseLink, "icon">[];
+    };
+
+export function FullWidthSidebarLayout(props: {
+  contentSidebarLinks: ShadcnSidebarLink[];
+  footerSidebarLinks?: ShadcnSidebarLink[];
+  children: React.ReactNode;
+  className?: string;
+}) {
+  const { contentSidebarLinks, children, footerSidebarLinks } = props;
+  return (
+    <div
+      className={cn(
+        "relative flex w-full flex-1 overflow-y-hidden",
+        props.className,
+      )}
+    >
+      {/* left - sidebar */}
+      <Sidebar className="pt-2" collapsible="icon" side="left">
+        <SidebarContent className="p-2">
+          <RenderSidebarMenu links={contentSidebarLinks} />
+        </SidebarContent>
+
+        {footerSidebarLinks && (
+          <SidebarFooter className="pb-3">
+            <RenderSidebarMenu links={footerSidebarLinks} />
+          </SidebarFooter>
+        )}
+
+        <SidebarRail />
+      </Sidebar>
+
+      {/* right - content */}
+      <div className="flex h-full flex-grow flex-col overflow-y-auto">
+        <MobileSidebarTrigger
+          links={[...contentSidebarLinks, ...(footerSidebarLinks || [])]}
+        />
+
+        <main className="flex min-w-0 grow flex-col max-sm:w-full">
+          {children}
+        </main>
+        <AppFooter containerClassName="max-w-7xl" />
+      </div>
+    </div>
+  );
+}
+
+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),
+  );
+
+  return (
+    <div className="flex items-center gap-3 border-b px-4 py-4 lg:hidden">
+      <SidebarTrigger className="size-4" />
+      <Separator
+        className="h-4 bg-muted-foreground/50"
+        orientation="vertical"
+      />
+      {parentSubNav && "subMenu" in parentSubNav && (
+        <>
+          <span className="text-sm">{parentSubNav.subMenu.label}</span>
+          <ChevronRightIcon className="size-4 text-muted-foreground/50 -mx-1.5" />
+        </>
+      )}
+      {activeLink && <span className="text-sm">{activeLink.label}</span>}
+    </div>
+  );
+}
+
+function useActiveShadcnSidebarLink(links: ShadcnSidebarLink[]) {
+  const pathname = usePathname();
+
+  const activeLink = useMemo(() => {
+    function isActive(link: ShadcnSidebarBaseLink) {
+      if (link.exactMatch) {
+        return link.href === pathname;
+      }
+      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;
+          }
+        }
+      } else if ("href" in link) {
+        if (isActive(link)) {
+          return link;
+        }
+      }
+    }
+  }, [links, pathname]);
+
+  return activeLink;
+}
+
+function useIsSubnavActive(links: ShadcnSidebarBaseLink[]) {
+  const pathname = usePathname();
+
+  const isSubnavActive = useMemo(() => {
+    function isActive(link: ShadcnSidebarBaseLink) {
+      if (link.exactMatch) {
+        return link.href === pathname;
+      }
+      return pathname?.startsWith(link.href);
+    }
+
+    return links.some(isActive);
+  }, [links, pathname]);
+
+  return isSubnavActive;
+}
+
+function RenderSidebarGroup(props: {
+  sidebarLinks: ShadcnSidebarLink[];
+  groupName: string;
+}) {
+  return (
+    <SidebarGroup className="p-0">
+      <SidebarMenuItem>
+        <SidebarGroupLabel> {props.groupName}</SidebarGroupLabel>
+        <SidebarGroupContent>
+          <RenderSidebarMenu links={props.sidebarLinks} />
+        </SidebarGroupContent>
+      </SidebarMenuItem>
+    </SidebarGroup>
+  );
+}
+
+function RenderSidebarSubmenu(props: {
+  links: ShadcnSidebarBaseLink[];
+  subMenu: Omit<ShadcnSidebarBaseLink, "href" | "exactMatch">;
+}) {
+  const sidebar = useSidebar();
+  const isSubnavActive = useIsSubnavActive(props.links);
+  return (
+    <SidebarMenu>
+      <DynamicHeight transition="height 200ms ease">
+        <Collapsible className="group/collapsible" defaultOpen={isSubnavActive}>
+          <SidebarMenuItem>
+            <CollapsibleTrigger asChild>
+              <SidebarMenuButton className="text-sm text-muted-foreground whitespace-nowrap">
+                {props.subMenu.icon && (
+                  <props.subMenu.icon className="size-4" />
+                )}
+                <span>{props.subMenu.label}</span>
+                <ChevronDownIcon className="ml-auto group-[[data-state=open]]/collapsible:rotate-180 transition-transform" />
+              </SidebarMenuButton>
+            </CollapsibleTrigger>
+
+            <CollapsibleContent className="mt-0.5">
+              <SidebarMenuSub className="pr-0 pl-2">
+                {props.links.map((link) => {
+                  return (
+                    <SidebarMenuSubItem key={link.href}>
+                      <NavLink
+                        activeClassName="text-foreground bg-accent "
+                        className="flex items-center gap-2 text-muted-foreground text-sm hover:bg-accent hover:text-foreground px-2 py-1.5 rounded-lg w-full"
+                        exactMatch={link.exactMatch}
+                        href={link.href}
+                        isActive={link.isActive}
+                        onClick={() => {
+                          sidebar.setOpenMobile(false);
+                        }}
+                      >
+                        {link.icon && <link.icon className="size-4" />}
+                        <span className="whitespace-nowrap">{link.label}</span>
+                      </NavLink>
+                    </SidebarMenuSubItem>
+                  );
+                })}
+              </SidebarMenuSub>
+            </CollapsibleContent>
+          </SidebarMenuItem>
+        </Collapsible>
+      </DynamicHeight>
+    </SidebarMenu>
+  );
+}
+
+function RenderSidebarMenu(props: { links: ShadcnSidebarLink[] }) {
+  const sidebar = useSidebar();
+  return (
+    <SidebarMenu className="gap-1.5">
+      {props.links.map((link, idx) => {
+        // link
+        if ("href" in link) {
+          return (
+            <SidebarMenuSubItem key={link.href}>
+              <SidebarMenuButton asChild>
+                <NavLink
+                  activeClassName="text-foreground bg-accent"
+                  className="flex items-center gap-2 text-muted-foreground text-sm hover:bg-accent"
+                  exactMatch={link.exactMatch}
+                  href={link.href}
+                  isActive={link.isActive}
+                  onClick={() => {
+                    sidebar.setOpenMobile(false);
+                  }}
+                >
+                  {link.icon && <link.icon className="size-4" />}
+                  <span>{link.label}</span>
+                </NavLink>
+              </SidebarMenuButton>
+            </SidebarMenuSubItem>
+          );
+        }
+
+        // separator
+        if ("separator" in link) {
+          return (
+            <SidebarSeparator
+              className="my-1"
+              key={`separator-${
+                // biome-ignore lint/suspicious/noArrayIndexKey: index is fine here
+                idx
+              }`}
+            />
+          );
+        }
+
+        // subnav
+        if ("subMenu" in link) {
+          return (
+            <RenderSidebarSubmenu
+              key={`submenu_$${
+                // biome-ignore lint/suspicious/noArrayIndexKey:  index is fine here
+                idx
+              }`}
+              links={link.links}
+              subMenu={link.subMenu}
+            />
+          );
+        }
+
+        // group
+        return (
+          <RenderSidebarGroup
+            groupName={link.group}
+            key={link.group}
+            sidebarLinks={link.links}
+          />
+        );
+      })}
+    </SidebarMenu>
+  );
+}

apps/dashboard/src/@/components/blocks/multi-step-status/multi-step-status.tsx

@@ -18,7 +18,7 @@ export type MultiStepState<T extends string> = {
       }
     | {
         type: "error";
-        message: React.ReactNode;
+        message: string;
       };
   label: string;
   description?: string;
@@ -27,6 +27,10 @@ export type MultiStepState<T extends string> = {
 export function MultiStepStatus<T extends string>(props: {
   steps: MultiStepState<T>[];
   onRetry: (step: MultiStepState<T>) => void;
+  renderError?: (
+    step: MultiStepState<T>,
+    errorMessage: string,
+  ) => React.ReactNode;
 }) {
   return (
     <DynamicHeight>
@@ -66,22 +70,24 @@ export function MultiStepStatus<T extends string>(props: {
                   </p>
                 )}
 
-              {step.status.type === "error" && (
-                <div className="mt-1 space-y-2">
-                  <p className="mb-1 text-red-500 text-sm">
-                    {step.status.message}
-                  </p>
-                  <Button
-                    className="gap-2"
-                    onClick={() => props.onRetry(step)}
-                    size="sm"
-                    variant="destructive"
-                  >
-                    <RefreshCwIcon className="size-4" />
-                    Retry
-                  </Button>
-                </div>
-              )}
+              {step.status.type === "error"
+                ? props.renderError?.(step, step.status.message) || (
+                    <div className="mt-1 space-y-2">
+                      <p className="mb-1 text-red-500 text-sm">
+                        {step.status.message}
+                      </p>
+                      <Button
+                        className="gap-2"
+                        onClick={() => props.onRetry(step)}
+                        size="sm"
+                        variant="destructive"
+                      >
+                        <RefreshCwIcon className="size-4" />
+                        Retry
+                      </Button>
+                    </div>
+                  )
+                : null}
             </div>
           </div>
         ))}

apps/dashboard/src/@/components/blocks/pagination-buttons.tsx

@@ -48,7 +48,7 @@ export const PaginationButtons = (props: {
         <PaginationContent>
           <PaginationItem>
             <PaginationPrevious
-              className="rounded-full"
+              className="rounded-full lg:min-w-[38px]"
               disabled={activePage === 1}
               onClick={() => {
                 setPage(activePage - 1);
@@ -57,7 +57,7 @@ export const PaginationButtons = (props: {
           </PaginationItem>
           <PaginationItem>
             <PaginationNext
-              className="rounded-full"
+              className="rounded-full lg:min-w-[38px]"
               disabled={activePage === totalPages}
               onClick={() => {
                 setPage(activePage + 1);
@@ -78,7 +78,7 @@ export const PaginationButtons = (props: {
           {pages.map((page) => (
             <PaginationItem key={page}>
               <PaginationLink
-                className="rounded-full"
+                className="rounded-full lg:min-w-[38px]"
                 isActive={activePage === page}
                 onClick={() => {
                   setPage(page);
@@ -98,7 +98,7 @@ export const PaginationButtons = (props: {
       <PaginationContent>
         <PaginationItem>
           <PaginationPrevious
-            className="rounded-full"
+            className="rounded-full lg:min-w-[38px]"
             disabled={activePage === 1}
             onClick={() => {
               setPage(activePage - 1);
@@ -111,7 +111,7 @@ export const PaginationButtons = (props: {
           <>
             <PaginationItem>
               <PaginationLink
-                className="rounded-full"
+                className="rounded-full lg:min-w-[38px]"
                 onClick={() => {
                   setPage(1);
                 }}
@@ -129,7 +129,7 @@ export const PaginationButtons = (props: {
         {activePage - 1 > 0 && (
           <PaginationItem className="max-sm:hidden">
             <PaginationLink
-              className="rounded-full"
+              className="rounded-full lg:min-w-[38px]"
               onClick={() => {
                 setPage(activePage - 1);
               }}
@@ -140,7 +140,7 @@ export const PaginationButtons = (props: {
         )}
 
         <PaginationItem>
-          <PaginationLink className="rounded-full" isActive>
+          <PaginationLink className="rounded-full lg:min-w-[38px]" isActive>
             {activePage}
           </PaginationLink>
         </PaginationItem>
@@ -148,7 +148,7 @@ export const PaginationButtons = (props: {
         {activePage + 1 <= totalPages && (
           <PaginationItem className="max-sm:hidden">
             <PaginationLink
-              className="rounded-full"
+              className="rounded-full lg:min-w-[38px]"
               onClick={() => {
                 setPage(activePage + 1);
               }}
@@ -167,7 +167,7 @@ export const PaginationButtons = (props: {
 
             <PaginationItem>
               <PaginationLink
-                className="rounded-full"
+                className="rounded-full lg:min-w-[38px]"
                 onClick={() => {
                   setPage(totalPages);
                 }}
@@ -180,7 +180,7 @@ export const PaginationButtons = (props: {
 
         <PaginationItem>
           <PaginationNext
-            className="rounded-full"
+            className="rounded-full lg:min-w-[38px]"
             disabled={activePage === totalPages}
             onClick={() => {
               setPage(activePage + 1);

apps/dashboard/src/@/components/blocks/select-with-search.tsx

@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/a11y/useSemanticElements: FIXME */
 "use client";
 
 import { CheckIcon, ChevronDownIcon, SearchIcon } from "lucide-react";
@@ -190,7 +191,6 @@ export const SelectWithSearch = React.forwardRef<
                       ref={
                         i === optionsToShow.length - 1 ? lastItemRef : undefined
                       }
-                      // biome-ignore lint/a11y/useSemanticElements: TDOO
                       role="option"
                       variant="ghost"
                     >

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

@@ -138,7 +138,7 @@ export function UpsellContent(props: {
         <div className="flex flex-col gap-3 pt-4 sm:flex-row">
           <Button asChild className="flex-1 py-3 font-semibold" size="lg">
             <Link
-              href={`/team/${props.teamSlug}/~/settings/billing?showPlans=true&highlight=${props.requiredPlan}`}
+              href={`/team/${props.teamSlug}/~/billing?showPlans=true&highlight=${props.requiredPlan}`}
             >
               <CrownIcon className="mr-2 h-4 w-4" />
               Upgrade to{" "}
@@ -146,9 +146,7 @@ export function UpsellContent(props: {
             </Link>
           </Button>
           <Button asChild className="md:flex-1" size="lg" variant="outline">
-            <Link
-              href={`/team/${props.teamSlug}/~/settings/billing?showPlans=true`}
-            >
+            <Link href={`/team/${props.teamSlug}/~/billing?showPlans=true`}>
               View All Plans
             </Link>
           </Button>

apps/dashboard/src/@/components/blocks/wallet-address.tsx

@@ -59,7 +59,11 @@ export function WalletAddress(props: {
 
   // special case for zero address
   if (address === ZERO_ADDRESS) {
-    return <span className="cursor-pointer font-mono">{shortenedAddress}</span>;
+    return (
+      <span className={cn("cursor-pointer font-mono", props.className)}>
+        {shortenedAddress}
+      </span>
+    );
   }
 
   return (

apps/dashboard/src/@/components/connect-wallet/index.tsx

@@ -120,20 +120,18 @@ export const CustomConnectWallet = (props: {
 
   if ((!isLoggedIn || !account) && loginRequired) {
     return (
-      <>
-        <Button
-          asChild
-          className={props.signInLinkButtonClassName}
-          size="lg"
-          variant="default"
+      <Button
+        asChild
+        className={props.signInLinkButtonClassName}
+        size="lg"
+        variant="default"
+      >
+        <Link
+          href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
         >
-          <Link
-            href={`/login${pathname ? `?next=${encodeURIComponent(pathname)}` : ""}`}
-          >
-            Connect Wallet
-          </Link>
-        </Button>
-      </>
+          Connect Wallet
+        </Link>
+      </Button>
     );
   }
 

apps/dashboard/src/@/components/contract-components/shared/contract-id-image.tsx

@@ -3,7 +3,8 @@
 import type { StaticImageData } from "next/image";
 import Image from "next/image";
 import type { FetchDeployMetadataResult } from "thirdweb/contract";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { replaceIpfsUrl } from "@/lib/sdk";
 import generalContractIcon from "../../../../../public/assets/tw-icons/general.png";
 
@@ -26,7 +27,17 @@ export const ContractIdImage: React.FC<ContractIdImageProps> = ({
       <img
         alt=""
         className="size-8 rounded-full"
-        src={replaceIpfsUrl(logo, serverThirdwebClient)}
+        src={
+          DASHBOARD_THIRDWEB_SECRET_KEY
+            ? replaceIpfsUrl(
+                logo,
+                getConfiguredThirdwebClient({
+                  secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+                  teamId: undefined,
+                }),
+              )
+            : logo
+        }
       />
     );
   }

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

@@ -314,7 +314,7 @@ const NetworkFilterCell = React.memo(function NetworkFilterCell({
   client: ThirdwebClient;
 }) {
   if (chainIds.length < 2) {
-    return <> NETWORK </>;
+    return "NETWORK";
   }
 
   return (

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

@@ -46,9 +46,9 @@ function AnnouncementBannerUI(props: {
 export function AnnouncementBanner() {
   return (
     <AnnouncementBannerUI
-      href="https://nebula.thirdweb.com/"
-      label="Announcing Nebula App — the most powerful AI for blockchains! Try it now!"
-      trackingLabel="nebula-beta-launch"
+      href="https://blog.thirdweb.com/the-fastest-way-to-build-web3-applications/"
+      label="We have re-branded our Engine, Universal Bridge, and Connect products. Please read the full blog post for details on changes"
+      trackingLabel="product-rebrand"
     />
   );
 }

apps/dashboard/src/@/components/project/create-project-modal/index.tsx

@@ -40,10 +40,7 @@ import { projectDomainsSchema, projectNameSchema } from "@/schema/validations";
 import { toArrFromList } from "@/utils/string";
 
 const ALL_PROJECT_SERVICES = SERVICES.filter(
-  (srv) =>
-    srv.name !== "relayer" &&
-    srv.name !== "chainsaw" &&
-    srv.name !== "engineCloud", // TODO enable once API server is out
+  (srv) => srv.name !== "relayer" && srv.name !== "chainsaw",
 );
 
 export type CreateProjectPrefillOptions = {

apps/dashboard/src/@/components/ui/collapsible.tsx

@@ -0,0 +1,11 @@
+"use client";
+
+import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
+
+const Collapsible = CollapsiblePrimitive.Root;
+
+const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;
+
+const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent;
+
+export { Collapsible, CollapsibleTrigger, CollapsibleContent };

apps/dashboard/src/@/components/ui/pagination.tsx

@@ -50,9 +50,10 @@ const PaginationLink = ({
   <Button
     aria-current={isActive ? "page" : undefined}
     className={cn(
-      "h-auto px-3 py-2",
+      "h-auto px-3 py-2 border border-transparent",
       className,
       props.disabled && "cursor-not-allowed",
+      !isActive && "border-border",
     )}
     variant={!isActive ? "outline" : "default"}
     {...props}

apps/dashboard/src/@/constants/thirdweb-client.server.ts

@@ -3,7 +3,9 @@ import "server-only";
 import { DASHBOARD_THIRDWEB_SECRET_KEY } from "./server-envs";
 import { getConfiguredThirdwebClient } from "./thirdweb.server";
 
+// During build time, the secret key might not be available
+// Create a client that will work for build but may fail at runtime if secret key is needed
 export const serverThirdwebClient = getConfiguredThirdwebClient({
-  secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+  secretKey: DASHBOARD_THIRDWEB_SECRET_KEY || "dummy-build-time-secret",
   teamId: undefined,
 });

apps/dashboard/src/@/constants/thirdweb.server.ts

@@ -76,14 +76,18 @@ export function getConfiguredThirdwebClient(options: {
     });
   }
 
+  // During build time, provide fallbacks if credentials are missing
+  const clientId = NEXT_PUBLIC_DASHBOARD_CLIENT_ID || "dummy-build-client";
+  const secretKey = options.secretKey || undefined;
+
   return createThirdwebClient({
-    clientId: NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
+    clientId: clientId,
     config: {
       storage: {
         gatewayUrl: NEXT_PUBLIC_IPFS_GATEWAY_URL,
       },
     },
-    secretKey: options.secretKey,
+    secretKey: secretKey,
     teamId: options.teamId,
   });
 }

apps/dashboard/src/@/hooks/useApi.ts

@@ -6,13 +6,6 @@ import { accountKeys, authorizedWallets } from "../query-keys/cache-keys";
 
 // FIXME: We keep repeating types, API server should provide them
 
-export const accountPlan = {
-  enterprise: "enterprise",
-  free: "free",
-  growth: "growth",
-  pro: "pro",
-} as const;
-
 export type AuthorizedWallet = {
   id: string;
   accountId: string;

apps/dashboard/src/@/hooks/useEmbeddedWallets.ts

@@ -22,6 +22,7 @@ const fetchAccountList = ({
       headers: {
         Authorization: `Bearer ${jwt}`,
         "Content-Type": "application/json",
+        "x-client-id": clientId,
       },
       method: "GET",
     });

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

@@ -30,7 +30,7 @@ export const ChainIconClient = ({
       fallback={<img alt="" src={fallbackChainIcon} />}
       key={resolvedSrc}
       loading={restProps.loading || "lazy"}
-      skeleton={<div className="animate-pulse rounded-full bg-border" />}
+      skeleton={<span className="animate-pulse rounded-full bg-border" />}
       src={resolvedSrc}
     />
   );

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

@@ -192,6 +192,7 @@ export function teamSubscriptionsStub(
       currentPeriodEnd: "2024-12-15T20:56:06.000Z",
       currentPeriodStart: "2024-11-15T20:56:06.000Z",
       id: "sub-1",
+      skus: [],
       status: "active",
       trialEnd: overrides?.trialEnd || null,
       trialStart: null,
@@ -212,6 +213,7 @@ export function teamSubscriptionsStub(
       currentPeriodEnd: "2024-12-15T20:56:06.000Z",
       currentPeriodStart: "2024-11-15T20:56:15.000Z",
       id: "sub-2",
+      skus: [],
       status: "active",
       trialEnd: null,
       trialStart: null,
@@ -229,25 +231,19 @@ 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 In-App Wallets (Tier 1 at $0.00 / month)`,
             thirdwebSku: "usage:in_app_wallet",
           },
           // AA Sponsorship
           {
             amount: usage.aaSponsorshipAmount?.amount || 0,
-            description: `${
-              usage.aaSponsorshipAmount?.quantity || 0
-            } x AA Gas Sponsorship (at $0.011 / month)`,
+            description: `${usage.aaSponsorshipAmount?.quantity || 0} x AA Gas Sponsorship (at $0.011 / month)`,
             thirdwebSku: "usage:aa_sponsorship",
           },
           // OP Grant
           {
             amount: usage.aaSponsorshipOpGrantAmount?.amount || 0,
-            description: `${
-              usage.aaSponsorshipOpGrantAmount?.quantity || 0
-            } x AA Gas Sponsorship (OP) (at $0.011 / month)`,
+            description: `${usage.aaSponsorshipOpGrantAmount?.quantity || 0} x AA Gas Sponsorship (OP) (at $0.011 / month)`,
             thirdwebSku: "usage:aa_sponsorship_op_grant",
           },
         ],

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

@@ -39,12 +39,6 @@ export interface TransactionStats {
   count: number;
 }
 
-export interface RpcMethodStats {
-  date: string;
-  evmMethod: string;
-  count: number;
-}
-
 export interface EngineCloudStats {
   date: string;
   chainId: string;
@@ -78,4 +72,5 @@ export interface AnalyticsQueryParams {
   from?: Date;
   to?: Date;
   period?: "day" | "week" | "month" | "year" | "all";
+  limit?: number;
 }

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

@@ -14,3 +14,8 @@ export type ProductSKU =
   | "usage:aa_sponsorship"
   | "usage:aa_sponsorship_op_grant"
   | null;
+
+export type ChainInfraSKU =
+  | "chain:infra:rpc"
+  | "chain:infra:insight"
+  | "chain:infra:account_abstraction";

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

@@ -23,7 +23,6 @@ export const TEAM_PLANS: Record<
     features: [
       "Email Support",
       "48hr Guaranteed Response",
-      "Invite Team Members",
       "Custom In-App Wallet Auth",
     ],
     price: 99,

apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx

@@ -1,5 +1,7 @@
-import { defineChain } from "thirdweb";
-import { getChainMetadata } from "thirdweb/chains";
+import { ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
+import { defineChain, getAddress, NATIVE_TOKEN_ADDRESS } from "thirdweb";
+import { type ChainMetadata, getChainMetadata } from "thirdweb/chains";
 import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { resolveSchemeWithErrorHandler } from "@/utils/resolveSchemeWithErrorHandler";
@@ -53,7 +55,7 @@ export async function RouteListCard({
 
   return (
     <div className="relative h-full">
-      <Card className="h-full w-full transition-colors hover:border-active-border">
+      <Card className="h-full w-full">
         <CardHeader className="flex flex-row items-center justify-between p-4">
           <div className="flex flex-row items-center gap-2">
             {resolvedOriginTokenIconUri ? (
@@ -80,32 +82,60 @@ export async function RouteListCard({
         </CardHeader>
 
         <CardContent className="px-4 pt-0 pb-4">
-          <table className="w-full">
-            <tbody className="text-sm [&_td>*]:min-h-[25px]">
-              <tr>
-                <th className="text-left font-normal text-base">
-                  {originTokenName === "ETH"
-                    ? originChain.nativeCurrency.name
-                    : originTokenName}
-                </th>
-                <td className="text-right text-base text-muted-foreground">
-                  {originChain.name}
-                </td>
-              </tr>
-              <tr>
-                <th className="text-left font-normal text-base">
-                  {destinationTokenName === "ETH"
-                    ? destinationChain.nativeCurrency.name
-                    : destinationTokenName}
-                </th>
-                <td className="text-right text-base text-muted-foreground">
-                  {destinationChain.name}
-                </td>
-              </tr>
-            </tbody>
-          </table>
+          <div className="flex flex-col gap-1">
+            <div className="flex justify-between gap-2">
+              <TokenName
+                chainMetadata={originChain}
+                tokenAddress={originTokenAddress}
+                tokenName={originTokenName}
+              />
+              <div className="text-right text-base text-muted-foreground">
+                {originChain.name}
+              </div>
+            </div>
+
+            <div className="flex justify-between gap-2">
+              <TokenName
+                chainMetadata={destinationChain}
+                tokenAddress={destinationTokenAddress}
+                tokenName={destinationTokenName}
+              />
+              <div className="text-right text-base text-muted-foreground">
+                {destinationChain.name}
+              </div>
+            </div>
+          </div>
         </CardContent>
       </Card>
     </div>
   );
 }
+
+const nativeTokenAddress = getAddress(NATIVE_TOKEN_ADDRESS);
+
+function TokenName(props: {
+  tokenAddress: string;
+  tokenName: string;
+  chainMetadata: ChainMetadata;
+}) {
+  const isERC20 = getAddress(props.tokenAddress) !== nativeTokenAddress;
+
+  if (isERC20) {
+    return (
+      <Link
+        className="flex items-center gap-1.5 font-normal text-base group/link hover:underline underline-offset-4 decoration-muted-foreground/50 decoration-dotted"
+        href={`https://thirdweb.com/${props.chainMetadata.slug}/${props.tokenAddress}`}
+        target="_blank"
+      >
+        {props.tokenName}
+        <ExternalLinkIcon className="size-3.5 text-muted-foreground group-hover/link:text-foreground" />
+      </Link>
+    );
+  }
+
+  return (
+    <div className="text-left font-normal text-base">
+      {props.chainMetadata.nativeCurrency.name}
+    </div>
+  );
+}

apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx

@@ -1,5 +1,14 @@
-import { defineChain, getChainMetadata } from "thirdweb/chains";
-import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
+import { getAddress, NATIVE_TOKEN_ADDRESS } from "thirdweb";
+import {
+  type ChainMetadata,
+  defineChain,
+  getChainMetadata,
+} from "thirdweb/chains";
+import { shortenAddress } from "thirdweb/utils";
+import { Img } from "@/components/blocks/Img";
+import { Button } from "@/components/ui/button";
 import { TableCell, TableRow } from "@/components/ui/table";
 import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
 import { resolveSchemeWithErrorHandler } from "@/utils/resolveSchemeWithErrorHandler";
@@ -52,37 +61,14 @@ export async function RouteListRow({
   ]);
 
   return (
-    <TableRow className="group transition-colors hover:bg-accent/50" linkBox>
+    <TableRow className="group">
       <TableCell>
-        <div className="flex flex-row items-center gap-3">
-          <div className="flex items-center gap-2">
-            {resolvedOriginTokenIconUri ? (
-              // For now we're using a normal img tag because the domain for these images is unknown
-              // eslint-disable-next-line @next/next/no-img-element
-              <img
-                alt={originTokenAddress}
-                className="size-7 rounded-full border border-border/50 shadow-sm transition-transform group-hover:scale-105"
-                src={resolvedOriginTokenIconUri}
-              />
-            ) : (
-              <div className="size-7 rounded-full bg-muted-foreground/20" />
-            )}
-            {originTokenSymbol && (
-              <CopyTextButton
-                className="relative z-10 font-medium text-base"
-                copyIconPosition="right"
-                textToCopy={originTokenAddress}
-                textToShow={
-                  originTokenSymbol === "ETH"
-                    ? originChain.nativeCurrency.symbol
-                    : originTokenSymbol
-                }
-                tooltip="Copy Token Address"
-                variant="ghost"
-              />
-            )}
-          </div>
-        </div>
+        <TokenInfo
+          chainMetadata={originChain}
+          tokenAddress={originTokenAddress}
+          tokenIconUri={resolvedOriginTokenIconUri}
+          tokenSymbol={originTokenSymbol}
+        />
       </TableCell>
 
       <TableCell className="text-muted-foreground/90">
@@ -90,34 +76,12 @@ export async function RouteListRow({
       </TableCell>
 
       <TableCell>
-        <div className="flex flex-row items-center gap-3">
-          <div className="flex items-center gap-2">
-            {resolvedDestinationTokenIconUri ? (
-              // eslint-disable-next-line @next/next/no-img-element
-              <img
-                alt={destinationTokenAddress}
-                className="size-7 rounded-full border border-border/50 shadow-sm transition-transform group-hover:scale-105"
-                src={resolvedDestinationTokenIconUri}
-              />
-            ) : (
-              <div className="size-7 rounded-full bg-muted-foreground/20" />
-            )}
-            {destinationTokenSymbol && (
-              <CopyTextButton
-                className="relative z-10 font-medium text-base"
-                copyIconPosition="right"
-                textToCopy={destinationTokenAddress}
-                textToShow={
-                  destinationTokenSymbol === "ETH"
-                    ? destinationChain.nativeCurrency.symbol
-                    : destinationTokenSymbol
-                }
-                tooltip="Copy Token Address"
-                variant="ghost"
-              />
-            )}
-          </div>
-        </div>
+        <TokenInfo
+          chainMetadata={destinationChain}
+          tokenAddress={destinationTokenAddress}
+          tokenIconUri={resolvedDestinationTokenIconUri}
+          tokenSymbol={destinationTokenSymbol}
+        />
       </TableCell>
 
       <TableCell className="text-muted-foreground/90">
@@ -126,3 +90,47 @@ export async function RouteListRow({
     </TableRow>
   );
 }
+
+const nativeTokenAddress = getAddress(NATIVE_TOKEN_ADDRESS);
+
+function TokenInfo(props: {
+  tokenAddress: string;
+  tokenSymbol: string | undefined;
+  chainMetadata: ChainMetadata;
+  tokenIconUri: string | undefined;
+}) {
+  const isERC20 = getAddress(props.tokenAddress) !== nativeTokenAddress;
+
+  return (
+    <div className="flex items-center gap-1.5">
+      {props.tokenIconUri ? (
+        <Img
+          alt={props.tokenAddress}
+          className="size-7 rounded-full border border-border/50"
+          src={props.tokenIconUri}
+        />
+      ) : (
+        <div className="size-7 rounded-full bg-muted-foreground/20" />
+      )}
+      {isERC20 ? (
+        <Button
+          asChild
+          className="h-auto w-auto py-1 px-1.5 gap-2"
+          variant="ghost"
+        >
+          <Link
+            href={`https://thirdweb.com/${props.chainMetadata.slug}/${props.tokenAddress}`}
+            target="_blank"
+          >
+            {props.tokenSymbol || shortenAddress(props.tokenAddress)}
+            <ExternalLinkIcon className="size-3.5 text-muted-foreground" />
+          </Link>
+        </Button>
+      ) : (
+        <span className="font-medium text-sm px-1.5 py-1">
+          {props.chainMetadata.nativeCurrency.symbol}
+        </span>
+      )}
+    </div>
+  );
+}

apps/dashboard/src/app/(app)/(dashboard)/(bridge)/routes/components/server/routes-table.tsx

@@ -86,22 +86,14 @@ export async function RoutesData(props: {
             <p className="text-2xl">No Results found</p>
           </div>
         ) : props.activeView === "table" ? (
-          <TableContainer className="overflow-hidden rounded-xl border border-border/50 bg-card/50 shadow-sm transition-all">
+          <TableContainer>
             <Table>
-              <TableHeader className="z-0">
-                <TableRow className="border-border/50 border-b bg-muted/50">
-                  <TableHead className="py-4 font-medium text-muted-foreground/80 text-xs uppercase tracking-wider">
-                    Origin Token
-                  </TableHead>
-                  <TableHead className="py-4 font-medium text-muted-foreground/80 text-xs uppercase tracking-wider">
-                    Origin Chain
-                  </TableHead>
-                  <TableHead className="py-4 font-medium text-muted-foreground/80 text-xs uppercase tracking-wider">
-                    Destination Token
-                  </TableHead>
-                  <TableHead className="py-4 font-medium text-muted-foreground/80 text-xs uppercase tracking-wider">
-                    Destination Chain
-                  </TableHead>
+              <TableHeader>
+                <TableRow>
+                  <TableHead>Origin Token</TableHead>
+                  <TableHead>Origin Chain</TableHead>
+                  <TableHead>Destination Token</TableHead>
+                  <TableHead>Destination Chain</TableHead>
                 </TableRow>
               </TableHeader>
               <TableBody>

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/(chainPage)/opengraph-image.tsx

@@ -1,7 +1,8 @@
 import { ImageResponse } from "next/og";
 import { useId } from "react";
 import { download } from "thirdweb/storage";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { fetchChain } from "@/utils/fetchChain";
 
 // Route segment config
@@ -81,16 +82,29 @@ export default async function Image({
     fetch(new URL("og-lib/fonts/inter/700.ttf", import.meta.url)).then((res) =>
       res.arrayBuffer(),
     ),
-    // download the chain icon if there is one
-    chain.icon?.url && hasWorkingChainIcon
-      ? download({
-          client: serverThirdwebClient,
-          uri: chain.icon.url,
-        }).then((res) => res.arrayBuffer())
+    // download the chain icon if there is one and secret key is available
+    chain.icon?.url && hasWorkingChainIcon && DASHBOARD_THIRDWEB_SECRET_KEY
+      ? (async () => {
+          try {
+            const client = getConfiguredThirdwebClient({
+              secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+              teamId: undefined,
+            });
+            const response = await download({
+              client,
+              uri: chain.icon?.url || "",
+            });
+            return response.arrayBuffer();
+          } catch (error) {
+            // If download fails, return undefined to fallback to no icon
+            console.warn("Failed to download chain icon:", error);
+            return undefined;
+          }
+        })()
       : undefined,
     // download the background image (based on chain)
     fetch(
-      chain.icon?.url && hasWorkingChainIcon
+      chain.icon?.url && hasWorkingChainIcon && DASHBOARD_THIRDWEB_SECRET_KEY
         ? new URL(
             "og-lib/assets/chain/bg-with-icon.png",
 
@@ -118,7 +132,7 @@ export default async function Image({
       />
       {/* the actual component starts here */}
 
-      {hasWorkingChainIcon && (
+      {hasWorkingChainIcon && chainIcon && (
         <img
           alt=""
           // @ts-expect-error - TS doesn't know about the ImageResponse component

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/marketplace-table.tsx

@@ -1,4 +1,5 @@
 // biome-ignore-all lint/nursery/noNestedComponentDefinitions: TODO
+/** biome-ignore-all lint/a11y/useSemanticElements: FIXME */
 
 import {
   IconButton,
@@ -256,7 +257,6 @@ export const MarketplaceTable: React.FC<MarketplaceTableProps> = ({
                   // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
                   key={rowIndex}
                   onClick={() => setTokenRow(row.original)}
-                  // biome-ignore lint/a11y/useSemanticElements: FIXME
                   role="group"
                   style={{ cursor: "pointer" }}
                 >

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/index.tsx

@@ -130,6 +130,7 @@ const getClaimConditionTypeFromPhase = (
 
   if (phase.snapshot) {
     if (
+      phase.maxClaimablePerWallet?.toString() === "0" &&
       phase.price === "0" &&
       typeof phase.snapshot !== "string" &&
       phase.snapshot.length === 1 &&
@@ -464,204 +465,198 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
   }
 
   return (
-    <>
-      <Flex as="form" direction="column" gap={10} onSubmit={handleFormSubmit}>
-        <Flex direction="column" gap={6}>
-          {/* Show the reason why the form is disabled */}
-          {!isAdmin && (
-            <Text>Connect with admin wallet to edit claim conditions.</Text>
-          )}
-          {controlledFields.map((field, index) => {
-            const dropType: DropType = field.snapshot
-              ? field.maxClaimablePerWallet?.toString() === "0"
-                ? "specific"
-                : "overrides"
-              : "any";
+    <Flex as="form" direction="column" gap={10} onSubmit={handleFormSubmit}>
+      <Flex direction="column" gap={6}>
+        {/* Show the reason why the form is disabled */}
+        {!isAdmin && (
+          <Text>Connect with admin wallet to edit claim conditions.</Text>
+        )}
+        {controlledFields.map((field, index) => {
+          const dropType: DropType = field.snapshot
+            ? field.maxClaimablePerWallet?.toString() === "0"
+              ? "specific"
+              : "overrides"
+            : "any";
 
-            const claimConditionType = getClaimConditionTypeFromPhase(field);
+          const claimConditionType = getClaimConditionTypeFromPhase(field);
 
-            const isActive = activePhaseId === field.id;
+          const isActive = activePhaseId === field.id;
 
-            const snapshotValue = field.snapshot?.map((v) =>
-              typeof v === "string"
-                ? {
-                    address: v,
-                    currencyAddress: ZERO_ADDRESS,
-                    maxClaimable: "unlimited",
-                    price: "unlimited",
-                  }
-                : {
-                    ...v,
-                    currencyAddress: v?.currencyAddress || ZERO_ADDRESS,
-                    maxClaimable: v?.maxClaimable?.toString() || "unlimited",
-                    price: v?.price?.toString() || "unlimited",
-                  },
-            );
+          const snapshotValue = field.snapshot?.map((v) =>
+            typeof v === "string"
+              ? {
+                  address: v,
+                  currencyAddress: ZERO_ADDRESS,
+                  maxClaimable: "unlimited",
+                  price: "unlimited",
+                }
+              : {
+                  ...v,
+                  currencyAddress: v?.currencyAddress || ZERO_ADDRESS,
+                  maxClaimable: v?.maxClaimable?.toString() || "unlimited",
+                  price: v?.price?.toString() || "unlimited",
+                },
+          );
 
-            return (
-              <Fragment key={`snapshot_${field.id}_${index}`}>
-                <SnapshotViewerSheet
-                  client={contract.client}
-                  dropType={dropType}
-                  isDisabled={!canEditForm}
-                  isOpen={openSnapshotIndex === index}
-                  onClose={() => {
-                    setOpenSnapshotIndex(-1);
-                  }}
-                  setSnapshot={(snapshot) =>
-                    form.setValue(`phases.${index}.snapshot`, snapshot)
-                  }
-                  value={snapshotValue}
-                />
+          return (
+            <Fragment key={`snapshot_${field.id}_${index}`}>
+              <SnapshotViewerSheet
+                client={contract.client}
+                dropType={dropType}
+                isDisabled={!canEditForm}
+                isOpen={openSnapshotIndex === index}
+                onClose={() => {
+                  setOpenSnapshotIndex(-1);
+                }}
+                setSnapshot={(snapshot) =>
+                  form.setValue(`phases.${index}.snapshot`, snapshot)
+                }
+                value={snapshotValue}
+              />
 
-                <ClaimsConditionFormContext.Provider
-                  value={{
-                    claimConditionType,
-                    dropType,
-                    field,
-                    form,
-                    formDisabled: !canEditForm,
-                    isActive,
-                    isAdmin,
-                    isColumn,
-                    isErc20,
-                    isMultiPhase,
-                    phaseIndex: index,
-                    setOpenSnapshotIndex,
-                    tokenDecimals: tokenDecimals.data,
-                  }}
-                >
-                  <ClaimConditionsPhase
-                    contract={contract}
-                    isPending={sendTx.isPending}
-                    onRemove={() => {
-                      removePhase(index);
-                    }}
-                  />
-                </ClaimsConditionFormContext.Provider>
-              </Fragment>
-            );
-          })}
-
-          {phases?.length === 0 && (
-            <Alert borderRadius="md" status="warning">
-              <AlertIcon />
-              <div className="flex flex-col">
-                <AlertTitle as={Heading} size="label.lg">
-                  {isMultiPhase
-                    ? "Missing Claim Phases"
-                    : "Missing Claim Conditions"}
-                </AlertTitle>
-                <AlertDescription as={Text}>
-                  {isMultiPhase
-                    ? "You need to set at least one claim phase for people to claim this drop."
-                    : "You need to set claim conditions for people to claim this drop."}
-                </AlertDescription>
-              </div>
-            </Alert>
-          )}
-
-          <Flex
-            flexDir={{ base: "column", md: "row" }}
-            gap={2}
-            justifyContent="space-between"
-          >
-            <div className="flex flex-row gap-2">
-              <AdminOnly contract={contract}>
-                <Menu>
-                  <MenuButton
-                    as={Button}
-                    borderRadius="md"
-                    colorScheme="primary"
-                    isDisabled={
-                      sendTx.isPending || (!isMultiPhase && phases?.length > 0)
-                    }
-                    leftIcon={<PlusIcon className="size-5" />}
-                    size="sm"
-                    variant={phases?.length > 0 ? "outline" : "solid"}
-                  >
-                    Add {isMultiPhase ? "Phase" : "Claim Conditions"}
-                  </MenuButton>
-                  <MenuList
-                    borderRadius="lg"
-                    overflow="hidden"
-                    zIndex="overlay"
-                  >
-                    {Object.keys(ClaimConditionTypeData).map((key) => {
-                      const type = key as ClaimConditionType;
-
-                      if (type === "custom") {
-                        return null;
-                      }
-
-                      return (
-                        <MenuItem
-                          key={type}
-                          onClick={() => {
-                            addPhase(type);
-                            // TODO: Automatically start editing the new phase after adding it
-                          }}
-                        >
-                          <div className="flex items-center gap-1">
-                            {ClaimConditionTypeData[type].name}
-                            <TooltipBox
-                              content={
-                                <Text size="body.md">
-                                  {ClaimConditionTypeData[type].description}
-                                </Text>
-                              }
-                            />
-                          </div>
-                        </MenuItem>
-                      );
-                    })}
-                  </MenuList>
-                </Menu>
-              </AdminOnly>
-
-              {controlledFields.some((field) => field.fromSdk) && (
-                <ResetClaimEligibility
+              <ClaimsConditionFormContext.Provider
+                value={{
+                  claimConditionType,
+                  dropType,
+                  field,
+                  form,
+                  formDisabled: !canEditForm,
+                  isActive,
+                  isAdmin,
+                  isColumn,
+                  isErc20,
+                  isMultiPhase,
+                  phaseIndex: index,
+                  setOpenSnapshotIndex,
+                  tokenDecimals: tokenDecimals.data,
+                }}
+              >
+                <ClaimConditionsPhase
                   contract={contract}
-                  isErc20={isErc20}
-                  isLoggedIn={isLoggedIn}
-                  isMultiphase={isMultiPhase}
-                  tokenId={tokenId}
+                  isPending={sendTx.isPending}
+                  onRemove={() => {
+                    removePhase(index);
+                  }}
                 />
-              )}
-            </div>
+              </ClaimsConditionFormContext.Provider>
+            </Fragment>
+          );
+        })}
 
-            <div className="flex flex-row">
-              <AdminOnly contract={contract} fallback={<Box pb={5} />}>
-                <Flex alignItems="center" gap={3} justifyContent="center">
-                  {(hasRemovedPhases || hasAddedPhases) && (
-                    <Text color="red.500" fontWeight="bold">
-                      You have unsaved changes
-                    </Text>
-                  )}
-                  {controlledFields.length > 0 ||
-                  hasRemovedPhases ||
-                  !isMultiPhase ? (
-                    <TransactionButton
-                      client={contract.client}
-                      disabled={claimConditionsQuery.isPending}
-                      isLoggedIn={isLoggedIn}
-                      isPending={sendTx.isPending}
-                      transactionCount={1}
-                      txChainID={contract.chain.id}
-                      type="submit"
-                    >
-                      {claimConditionsQuery.isPending
-                        ? "Saving Phases"
-                        : "Save Phases"}
-                    </TransactionButton>
-                  ) : null}
-                </Flex>
-              </AdminOnly>
+        {phases?.length === 0 && (
+          <Alert borderRadius="md" status="warning">
+            <AlertIcon />
+            <div className="flex flex-col">
+              <AlertTitle as={Heading} size="label.lg">
+                {isMultiPhase
+                  ? "Missing Claim Phases"
+                  : "Missing Claim Conditions"}
+              </AlertTitle>
+              <AlertDescription as={Text}>
+                {isMultiPhase
+                  ? "You need to set at least one claim phase for people to claim this drop."
+                  : "You need to set claim conditions for people to claim this drop."}
+              </AlertDescription>
             </div>
-          </Flex>
+          </Alert>
+        )}
+
+        <Flex
+          flexDir={{ base: "column", md: "row" }}
+          gap={2}
+          justifyContent="space-between"
+        >
+          <div className="flex flex-row gap-2">
+            <AdminOnly contract={contract}>
+              <Menu>
+                <MenuButton
+                  as={Button}
+                  borderRadius="md"
+                  colorScheme="primary"
+                  isDisabled={
+                    sendTx.isPending || (!isMultiPhase && phases?.length > 0)
+                  }
+                  leftIcon={<PlusIcon className="size-5" />}
+                  size="sm"
+                  variant={phases?.length > 0 ? "outline" : "solid"}
+                >
+                  Add {isMultiPhase ? "Phase" : "Claim Conditions"}
+                </MenuButton>
+                <MenuList borderRadius="lg" overflow="hidden" zIndex="overlay">
+                  {Object.keys(ClaimConditionTypeData).map((key) => {
+                    const type = key as ClaimConditionType;
+
+                    if (type === "custom") {
+                      return null;
+                    }
+
+                    return (
+                      <MenuItem
+                        key={type}
+                        onClick={() => {
+                          addPhase(type);
+                          // TODO: Automatically start editing the new phase after adding it
+                        }}
+                      >
+                        <div className="flex items-center gap-1">
+                          {ClaimConditionTypeData[type].name}
+                          <TooltipBox
+                            content={
+                              <Text size="body.md">
+                                {ClaimConditionTypeData[type].description}
+                              </Text>
+                            }
+                          />
+                        </div>
+                      </MenuItem>
+                    );
+                  })}
+                </MenuList>
+              </Menu>
+            </AdminOnly>
+
+            {controlledFields.some((field) => field.fromSdk) && (
+              <ResetClaimEligibility
+                contract={contract}
+                isErc20={isErc20}
+                isLoggedIn={isLoggedIn}
+                isMultiphase={isMultiPhase}
+                tokenId={tokenId}
+              />
+            )}
+          </div>
+
+          <div className="flex flex-row">
+            <AdminOnly contract={contract} fallback={<Box pb={5} />}>
+              <Flex alignItems="center" gap={3} justifyContent="center">
+                {(hasRemovedPhases || hasAddedPhases) && (
+                  <Text color="red.500" fontWeight="bold">
+                    You have unsaved changes
+                  </Text>
+                )}
+                {controlledFields.length > 0 ||
+                hasRemovedPhases ||
+                !isMultiPhase ? (
+                  <TransactionButton
+                    client={contract.client}
+                    disabled={claimConditionsQuery.isPending}
+                    isLoggedIn={isLoggedIn}
+                    isPending={sendTx.isPending}
+                    transactionCount={1}
+                    txChainID={contract.chain.id}
+                    type="submit"
+                  >
+                    {claimConditionsQuery.isPending
+                      ? "Saving Phases"
+                      : "Save Phases"}
+                  </TransactionButton>
+                ) : null}
+              </Flex>
+            </AdminOnly>
+          </div>
         </Flex>
       </Flex>
-    </>
+    </Flex>
   );
 };
 

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

@@ -1,6 +1,7 @@
 import { getAddress, getContract, isAddress } from "thirdweb";
 import { localhost } from "thirdweb/chains";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { mapV4ChainToV5Chain } from "@/utils/map-chains";
 import { getUserThirdwebClient } from "../../../../../../../@/api/auth-token";
 import { fetchChainWithLocalOverrides } from "../../../../../../../@/utils/fetchChainWithLocalOverrides";
@@ -18,13 +19,21 @@ export async function getContractPageParamsInfo(params: {
     return undefined;
   }
 
-  // attempt to get the auth token
+  // Create server client only if secret key is available
+  if (!DASHBOARD_THIRDWEB_SECRET_KEY) {
+    return undefined;
+  }
+
+  const serverClient = getConfiguredThirdwebClient({
+    secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+    teamId: undefined,
+  });
 
   const serverContract = getContract({
     address: contractAddress,
     // eslint-disable-next-line no-restricted-syntax
     chain: mapV4ChainToV5Chain(chainMetadata),
-    client: serverThirdwebClient,
+    client: serverClient,
   });
 
   const clientContract = getContract({

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/table.tsx

@@ -1,4 +1,5 @@
 /** biome-ignore-all lint/nursery/noNestedComponentDefinitions: FIXME */
+/** biome-ignore-all lint/a11y/useSemanticElements: FIXME */
 "use client";
 
 import {
@@ -320,7 +321,6 @@ export const NFTGetAllTable: React.FC<ContractOverviewNFTGetAllProps> = ({
                   }}
                   opacity={failedToLoad ? 0.3 : 1}
                   pointerEvents={failedToLoad ? "none" : "auto"}
-                  // biome-ignore lint/a11y/useSemanticElements: FIXME
                   role="group"
                   style={{ cursor: "pointer" }}
                 >

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/getContractCreator.tsx

@@ -9,19 +9,23 @@ export async function getContractCreator(
   contract: ThirdwebContract,
   functionSelectors: string[],
 ) {
-  if (isOwnerSupported(functionSelectors)) {
-    return owner({
-      contract,
-    });
-  }
+  try {
+    if (isOwnerSupported(functionSelectors)) {
+      return await owner({
+        contract,
+      });
+    }
 
-  if (isGetRoleAdminSupported(functionSelectors)) {
-    return getRoleMember({
-      contract,
-      index: BigInt(0),
-      role: "admin",
-    });
-  }
+    if (isGetRoleAdminSupported(functionSelectors)) {
+      return await getRoleMember({
+        contract,
+        index: BigInt(0),
+        role: "admin",
+      });
+    }
 
-  return null;
+    return null;
+  } catch {
+    return null;
+  }
 }

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_components/ContractHeader.tsx

@@ -1,7 +1,7 @@
 import { ExternalLinkIcon, GlobeIcon, Settings2Icon } from "lucide-react";
 import Link from "next/link";
 import { useMemo } from "react";
-import type { ThirdwebContract } from "thirdweb";
+import { type ThirdwebContract, ZERO_ADDRESS } from "thirdweb";
 import type { ChainMetadata } from "thirdweb/chains";
 import { Img } from "@/components/blocks/Img";
 import { Button } from "@/components/ui/button";
@@ -149,7 +149,7 @@ export function ContractHeaderUI(props: {
 
         {/* bottom row */}
         <div className="flex flex-row flex-wrap items-center gap-2">
-          {props.contractCreator && (
+          {props.contractCreator && props.contractCreator !== ZERO_ADDRESS && (
             <ContractCreatorBadge
               clientContract={props.clientContract}
               contractCreator={props.contractCreator}

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/erc20/_utils/fetch-coin-info.ts

@@ -7,10 +7,18 @@ export async function fetchTokenInfoFromBridge(params: {
 }) {
   try {
     const res = await fetch(
-      `https://bridge.${isProd ? "thirdweb.com" : "thirdweb-dev.com"}/v1/tokens?chainId=${params.chainId}&tokenAddress=${params.tokenAddress}&clientId=${params.clientId}`,
+      `https://bridge.${isProd ? "thirdweb.com" : "thirdweb-dev.com"}/v1/tokens?chainId=${params.chainId}&tokenAddress=${params.tokenAddress}`,
+      {
+        headers: {
+          "x-client-id": params.clientId,
+        },
+      },
     );
 
     if (!res.ok) {
+      console.error(
+        `Failed to fetch token info from bridge: ${await res.text()}`,
+      );
       return null;
     }
 

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/nft/overview/nfts-grid.tsx

@@ -1,3 +1,4 @@
+/** biome-ignore-all lint/a11y/useSemanticElements: EXPECTED */
 "use client";
 
 import { CheckCheckIcon } from "lucide-react";
@@ -210,7 +211,6 @@ function NFTCard(props: {
             }
           : undefined
       }
-      // biome-ignore lint/a11y/useSemanticElements: FIXME
       role="button"
       tabIndex={props.onClick ? 0 : undefined}
     >

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/tokens/components/airdrop-form.tsx

@@ -43,94 +43,92 @@ export const TokenAirdropForm: React.FC<TokenAirdropFormProps> = ({
   );
 
   return (
-    <>
-      <div className="pt-3">
-        <form
-          onSubmit={handleSubmit(async (data) => {
-            try {
-              const tx = transferBatch({
-                batch: data.addresses
-                  .filter((address) => address.quantity !== undefined)
-                  .map((address) => ({
-                    amount: address.quantity,
-                    to: address.address,
-                  })),
-                contract,
-              });
-              await sendTransaction.mutateAsync(tx, {
-                onError: (error) => {
-                  console.error(error);
-                },
-                onSuccess: () => {
-                  // Close the sheet/modal on success
-                  if (toggle) {
-                    toggle(false);
-                  }
-                },
-              });
-              airdropNotifications.onSuccess();
-            } catch (err) {
-              airdropNotifications.onError(err);
-              console.error(err);
-            }
-          })}
-        >
-          <div className="mb-3 flex w-full flex-col gap-6 md:flex-row">
-            {airdropFormOpen ? (
-              <AirdropUpload
-                client={contract.client}
-                onClose={() => setAirdropFormOpen(false)}
-                setAirdrop={(value) =>
-                  setValue("addresses", value, { shouldDirty: true })
+    <div className="pt-3">
+      <form
+        onSubmit={handleSubmit(async (data) => {
+          try {
+            const tx = transferBatch({
+              batch: data.addresses
+                .filter((address) => address.quantity !== undefined)
+                .map((address) => ({
+                  amount: address.quantity,
+                  to: address.address,
+                })),
+              contract,
+            });
+            await sendTransaction.mutateAsync(tx, {
+              onError: (error) => {
+                console.error(error);
+              },
+              onSuccess: () => {
+                // Close the sheet/modal on success
+                if (toggle) {
+                  toggle(false);
                 }
-              />
-            ) : (
-              <div className="flex flex-col gap-4 md:flex-row">
-                <Button
-                  borderRadius="md"
-                  colorScheme="primary"
-                  onClick={() => setAirdropFormOpen(true)}
-                  rightIcon={<UploadIcon className="size-4" />}
-                >
-                  Upload addresses
-                </Button>
-                {addresses.length > 0 && (
-                  <div className="flex flex-row items-center justify-center gap-2 text-green-500">
-                    <CircleCheckIcon className="text-green-500" size={16} />
-                    <Text color="inherit" size="body.sm">
-                      <strong>{addresses.length} addresses</strong> ready to be
-                      airdropped
-                    </Text>
-                  </div>
-                )}
-              </div>
-            )}
-          </div>
-          {addresses?.length > 0 && !airdropFormOpen && (
-            <>
-              {estimateGasCost && (
-                <Text>
-                  This transaction requires at least {estimateGasCost} gas.
-                  Since each chain has a different gas limit, please split this
-                  operation into multiple transactions if necessary. Usually
-                  under 10M gas is safe.
-                </Text>
-              )}
-              <TransactionButton
-                className="self-end"
-                client={contract.client}
-                isLoggedIn={isLoggedIn}
-                isPending={sendTransaction.isPending}
-                transactionCount={1}
-                txChainID={contract.chain.id}
-                type="submit"
+              },
+            });
+            airdropNotifications.onSuccess();
+          } catch (err) {
+            airdropNotifications.onError(err);
+            console.error(err);
+          }
+        })}
+      >
+        <div className="mb-3 flex w-full flex-col gap-6 md:flex-row">
+          {airdropFormOpen ? (
+            <AirdropUpload
+              client={contract.client}
+              onClose={() => setAirdropFormOpen(false)}
+              setAirdrop={(value) =>
+                setValue("addresses", value, { shouldDirty: true })
+              }
+            />
+          ) : (
+            <div className="flex flex-col gap-4 md:flex-row">
+              <Button
+                borderRadius="md"
+                colorScheme="primary"
+                onClick={() => setAirdropFormOpen(true)}
+                rightIcon={<UploadIcon className="size-4" />}
               >
-                Airdrop
-              </TransactionButton>
-            </>
+                Upload addresses
+              </Button>
+              {addresses.length > 0 && (
+                <div className="flex flex-row items-center justify-center gap-2 text-green-500">
+                  <CircleCheckIcon className="text-green-500" size={16} />
+                  <Text color="inherit" size="body.sm">
+                    <strong>{addresses.length} addresses</strong> ready to be
+                    airdropped
+                  </Text>
+                </div>
+              )}
+            </div>
           )}
-        </form>
-      </div>
-    </>
+        </div>
+        {addresses?.length > 0 && !airdropFormOpen && (
+          <>
+            {estimateGasCost && (
+              <Text>
+                This transaction requires at least {estimateGasCost} gas. Since
+                each chain has a different gas limit, please split this
+                operation into multiple transactions if necessary. Usually under
+                10M gas is safe.
+              </Text>
+            )}
+            <TransactionButton
+              className="self-end"
+              client={contract.client}
+              isLoggedIn={isLoggedIn}
+              isPending={sendTransaction.isPending}
+              transactionCount={1}
+              txChainID={contract.chain.id}
+              type="submit"
+            >
+              Airdrop
+            </TransactionButton>
+          </>
+        )}
+      </form>
+    </div>
   );
 };

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

@@ -1,7 +1,7 @@
 /* eslint-disable @next/next/no-img-element */
 import "server-only";
 import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { cn } from "@/lib/utils";
 import { resolveSchemeWithErrorHandler } from "@/utils/resolveSchemeWithErrorHandler";
 import { fallbackChainIcon } from "../../../../../../@/utils/chain-icons";
@@ -13,10 +13,16 @@ export async function ChainIcon(props: {
   if (props.iconUrl) {
     let imageLink = fallbackChainIcon;
 
-    const resolved = resolveSchemeWithErrorHandler({
-      client: serverThirdwebClient,
-      uri: props.iconUrl,
-    });
+    // Only resolve if we have a secret key available
+    const resolved = DASHBOARD_THIRDWEB_SECRET_KEY
+      ? resolveSchemeWithErrorHandler({
+          client: getConfiguredThirdwebClient({
+            secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+            teamId: undefined,
+          }),
+          uri: props.iconUrl,
+        })
+      : null;
 
     if (resolved) {
       // check if it loads or not

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

@@ -5,7 +5,7 @@ import { Suspense } from "react";
 import {
   ContractCard,
   ContractCardSkeleton,
-} from "../../../../../../@/components/contracts/contract-card";
+} from "@/components/contracts/contract-card";
 
 interface ContractRowProps {
   category: ExploreCategory;

apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/components/PublishedContractTable.tsx

@@ -182,19 +182,17 @@ function ContractTableRow(props: { row: Row<ContractDataRow> }) {
   const { row } = props;
   const { key, ...rowProps } = row.getRowProps();
   return (
-    <>
-      <TableRow
-        className="cursor-pointer hover:bg-card"
-        linkBox
-        {...rowProps}
-        key={key}
-      >
-        {row.cells.map((cell) => (
-          <TableCell {...cell.getCellProps()} key={cell.getCellProps().key}>
-            {cell.render("Cell")}
-          </TableCell>
-        ))}
-      </TableRow>
-    </>
+    <TableRow
+      className="cursor-pointer hover:bg-card"
+      linkBox
+      {...rowProps}
+      key={key}
+    >
+      {row.cells.map((cell) => (
+        <TableCell {...cell.getCellProps()} key={cell.getCellProps().key}>
+          {cell.render("Cell")}
+        </TableCell>
+      ))}
+    </TableRow>
   );
 }

apps/dashboard/src/app/(app)/(dashboard)/profile/[addressOrEns]/opengraph-image.tsx

@@ -2,7 +2,8 @@ import { notFound } from "next/navigation";
 import { ImageResponse } from "next/og";
 import { resolveAvatar } from "thirdweb/extensions/ens";
 import { GradientBlobbie } from "@/components/blocks/avatar/GradientBlobbie";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 /* eslint-disable @next/next/no-img-element */
 import { resolveSchemeWithErrorHandler } from "@/utils/resolveSchemeWithErrorHandler";
 import { shortenIfAddress } from "@/utils/usedapp-external";
@@ -23,10 +24,18 @@ type PageProps = {
 
 export default async function Image(props: PageProps) {
   const params = await props.params;
-  const resolvedInfo = await resolveAddressAndEns(
-    params.addressOrEns,
-    serverThirdwebClient,
-  );
+
+  // Create client only if secret key is available
+  if (!DASHBOARD_THIRDWEB_SECRET_KEY) {
+    notFound();
+  }
+
+  const client = getConfiguredThirdwebClient({
+    secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+    teamId: undefined,
+  });
+
+  const resolvedInfo = await resolveAddressAndEns(params.addressOrEns, client);
 
   if (!resolvedInfo) {
     notFound();
@@ -43,14 +52,14 @@ export default async function Image(props: PageProps) {
 
   const ensImage = resolvedInfo.ensName
     ? await resolveAvatar({
-        client: serverThirdwebClient,
+        client,
         name: resolvedInfo.ensName,
       })
     : null;
 
   const resolvedENSImageSrc = ensImage
     ? resolveSchemeWithErrorHandler({
-        client: serverThirdwebClient,
+        client,
         uri: ensImage,
       })
     : null;

apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/[version]/opengraph-image.tsx

@@ -1,6 +1,7 @@
 import { format } from "date-fns";
 import { getSocialProfiles } from "thirdweb/social";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { resolveEns } from "@/lib/ens";
 import { correctAndUniqueLicenses } from "@/lib/licenses";
 import { getPublishedContractsWithPublisherMapping } from "../utils/getPublishedContractsWithPublisherMapping";
@@ -22,17 +23,25 @@ export default async function Image(props: {
 }) {
   const { publisher, contract_id } = props.params;
 
+  // Create client only if secret key is available
+  if (!DASHBOARD_THIRDWEB_SECRET_KEY) {
+    return null;
+  }
+
+  const client = getConfiguredThirdwebClient({
+    secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+    teamId: undefined,
+  });
+
   const [publishedContracts, socialProfiles] = await Promise.all([
     getPublishedContractsWithPublisherMapping({
-      client: serverThirdwebClient,
+      client,
       contract_id: contract_id,
       publisher: publisher,
     }),
     getSocialProfiles({
-      address:
-        (await resolveEns(publisher, serverThirdwebClient)).address ||
-        publisher,
-      client: serverThirdwebClient,
+      address: (await resolveEns(publisher, client)).address || publisher,
+      client,
     }),
   ]);
 

apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/opengraph-image.tsx

@@ -1,6 +1,7 @@
 import { format } from "date-fns";
 import { getSocialProfiles } from "thirdweb/social";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { resolveEns } from "@/lib/ens";
 import { correctAndUniqueLicenses } from "@/lib/licenses";
 import { getLatestPublishedContractsWithPublisherMapping } from "./utils/getPublishedContractsWithPublisherMapping";
@@ -21,17 +22,25 @@ export default async function Image(props: {
 }) {
   const { publisher, contract_id } = props.params;
 
+  // Create client only if secret key is available
+  if (!DASHBOARD_THIRDWEB_SECRET_KEY) {
+    return null;
+  }
+
+  const client = getConfiguredThirdwebClient({
+    secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+    teamId: undefined,
+  });
+
   const [publishedContract, socialProfiles] = await Promise.all([
     getLatestPublishedContractsWithPublisherMapping({
-      client: serverThirdwebClient,
+      client,
       contract_id: contract_id,
       publisher: publisher,
     }),
     getSocialProfiles({
-      address:
-        (await resolveEns(publisher, serverThirdwebClient)).address ||
-        publisher,
-      client: serverThirdwebClient,
+      address: (await resolveEns(publisher, client)).address || publisher,
+      client,
     }),
   ]);
 

apps/dashboard/src/app/(app)/(dashboard)/published-contract/[publisher]/[contract_id]/utils/publishedContractOGImageTemplate.tsx

@@ -4,7 +4,8 @@ import { ImageResponse } from "next/og";
 import { isAddress } from "thirdweb";
 import { download } from "thirdweb/storage";
 import { shortenAddress } from "thirdweb/utils";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 
 const OgBrandIcon: React.FC = () => (
   // biome-ignore lint/a11y/noSvgWithoutTitle: not needed
@@ -187,17 +188,41 @@ export async function publishedContractOGImageTemplate(params: {
     ibmPlexMono500_,
     ibmPlexMono700_,
     image,
-    params.logo
-      ? download({
-          client: serverThirdwebClient,
-          uri: params.logo,
-        }).then((res) => res.arrayBuffer())
+    params.logo && DASHBOARD_THIRDWEB_SECRET_KEY
+      ? (async () => {
+          try {
+            const client = getConfiguredThirdwebClient({
+              secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+              teamId: undefined,
+            });
+            const response = await download({
+              client,
+              uri: params.logo || "",
+            });
+            return response.arrayBuffer();
+          } catch (error) {
+            console.warn("Failed to download logo:", error);
+            return undefined;
+          }
+        })()
       : undefined,
-    params.publisherAvatar
-      ? download({
-          client: serverThirdwebClient,
-          uri: params.publisherAvatar,
-        }).then((res) => res.arrayBuffer())
+    params.publisherAvatar && DASHBOARD_THIRDWEB_SECRET_KEY
+      ? (async () => {
+          try {
+            const client = getConfiguredThirdwebClient({
+              secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+              teamId: undefined,
+            });
+            const response = await download({
+              client,
+              uri: params.publisherAvatar || "",
+            });
+            return response.arrayBuffer();
+          } catch (error) {
+            console.warn("Failed to download avatar:", error);
+            return undefined;
+          }
+        })()
       : undefined,
   ]);
 

apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/contact-forms/shared/SupportForm_SelectInput.tsx

@@ -21,37 +21,33 @@ export const SupportForm_SelectInput = (props: Props) => {
   const { options, formLabel, name, required, promptText } = props;
 
   return (
-    <>
-      <div className="flex flex-col items-start gap-2">
-        <Label className="relative" htmlFor={name}>
-          {formLabel}
-          {required && (
-            <span className="-top-1.5 -right-2 absolute text-destructive">
-              •
-            </span>
-          )}
-        </Label>
+    <div className="flex flex-col items-start gap-2">
+      <Label className="relative" htmlFor={name}>
+        {formLabel}
+        {required && (
+          <span className="-top-1.5 -right-2 absolute text-destructive">•</span>
+        )}
+      </Label>
 
-        <Select
-          name={name}
-          onValueChange={(val) => {
-            props.onValueChange(val);
-          }}
-          required={required}
-          value={props.value}
-        >
-          <SelectTrigger>
-            <SelectValue placeholder={promptText}>{props.value}</SelectValue>
-          </SelectTrigger>
-          <SelectContent>
-            {options.map((option) => (
-              <SelectItem key={option} value={option}>
-                {option}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      </div>
-    </>
+      <Select
+        name={name}
+        onValueChange={(val) => {
+          props.onValueChange(val);
+        }}
+        required={required}
+        value={props.value}
+      >
+        <SelectTrigger>
+          <SelectValue placeholder={promptText}>{props.value}</SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+          {options.map((option) => (
+            <SelectItem key={option} value={option}>
+              {option}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    </div>
   );
 };

apps/dashboard/src/app/(app)/(dashboard)/support/create-ticket/components/contact-forms/shared/SupportForm_TeamSelection.tsx

@@ -27,34 +27,32 @@ export const SupportForm_TeamSelection = (props: Props) => {
   const teamId = useId();
 
   return (
-    <>
-      <div className="flex flex-col items-start gap-2">
-        <Label className="relative" htmlFor={teamId}>
-          Select Team
-          <span className="-top-1.5 -right-2 absolute text-destructive">•</span>
-        </Label>
+    <div className="flex flex-col items-start gap-2">
+      <Label className="relative" htmlFor={teamId}>
+        Select Team
+        <span className="-top-1.5 -right-2 absolute text-destructive">•</span>
+      </Label>
 
-        <Select
-          name="teamId"
-          onValueChange={(selectedId) => {
-            props.onChange(selectedId);
-          }}
-          value={props.selectedTeamId}
-        >
-          <SelectTrigger id={teamId}>
-            <SelectValue placeholder="Select a Team">
-              {selectedTeamName}
-            </SelectValue>
-          </SelectTrigger>
-          <SelectContent>
-            {props.teams.map((team) => (
-              <SelectItem key={team.id} value={team.id}>
-                {team.name}
-              </SelectItem>
-            ))}
-          </SelectContent>
-        </Select>
-      </div>
-    </>
+      <Select
+        name="teamId"
+        onValueChange={(selectedId) => {
+          props.onChange(selectedId);
+        }}
+        value={props.selectedTeamId}
+      >
+        <SelectTrigger id={teamId}>
+          <SelectValue placeholder="Select a Team">
+            {selectedTeamName}
+          </SelectValue>
+        </SelectTrigger>
+        <SelectContent>
+          {props.teams.map((team) => (
+            <SelectItem key={team.id} value={team.id}>
+              {team.name}
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
+    </div>
   );
 };

apps/dashboard/src/app/(app)/components/Header/SecondaryNav/account-button.client.tsx

@@ -76,7 +76,7 @@ export function AccountButton(props: {
             className="justify-start px-3 text-muted-foreground text-sm hover:text-foreground"
             variant="ghost"
           >
-            <Link href="/team/~/~/settings/billing">Manage Billing</Link>
+            <Link href="/team/~/~/billing">Manage Billing</Link>
           </Button>
 
           <Button

apps/dashboard/src/app/(app)/drops/[slug]/opengraph-image.tsx

@@ -1,7 +1,8 @@
 import { ImageResponse } from "next/og";
 import { useId } from "react";
 import { download } from "thirdweb/storage";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { fetchChain } from "@/utils/fetchChain";
 import { DROP_PAGES } from "./data";
 
@@ -84,16 +85,29 @@ export default async function Image({ params }: { params: { slug: string } }) {
     fetch(new URL("og-lib/fonts/inter/700.ttf", import.meta.url)).then((res) =>
       res.arrayBuffer(),
     ),
-    // download the chain icon if there is one
-    chain.icon?.url && hasWorkingChainIcon
-      ? download({
-          client: serverThirdwebClient,
-          uri: chain.icon.url,
-        }).then((res) => res.arrayBuffer())
+    // download the chain icon if there is one and secret key is available
+    chain.icon?.url && hasWorkingChainIcon && DASHBOARD_THIRDWEB_SECRET_KEY
+      ? (async () => {
+          try {
+            const client = getConfiguredThirdwebClient({
+              secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+              teamId: undefined,
+            });
+            const response = await download({
+              client,
+              uri: chain.icon?.url || "",
+            });
+            return response.arrayBuffer();
+          } catch (error) {
+            // If download fails, return undefined to fallback to no icon
+            console.warn("Failed to download chain icon:", error);
+            return undefined;
+          }
+        })()
       : undefined,
     // download the background image (based on chain)
     fetch(
-      chain.icon?.url && hasWorkingChainIcon
+      chain.icon?.url && hasWorkingChainIcon && DASHBOARD_THIRDWEB_SECRET_KEY
         ? new URL(
             "og-lib/assets/chain/bg-with-icon.png",
 
@@ -121,7 +135,7 @@ export default async function Image({ params }: { params: { slug: string } }) {
       />
       {/* the actual component starts here */}
 
-      {hasWorkingChainIcon && (
+      {hasWorkingChainIcon && chainIcon && (
         <img
           alt=""
           // @ts-expect-error - TS doesn't know about the ImageResponse component

apps/dashboard/src/app/(app)/drops/[slug]/page.tsx

@@ -11,7 +11,8 @@ import {
   getActiveClaimCondition as getActiveClaimCondition1155,
   getNFT as getNFT1155,
 } from "thirdweb/extensions/erc1155";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { defineDashboardChain } from "@/lib/defineDashboardChain";
 import { DROP_PAGES } from "./data";
 import { NftMint } from "./mint-ui";
@@ -41,13 +42,24 @@ export default async function DropPage({
   if (!project) {
     return notFound();
   }
+
+  // Create client only if secret key is available
+  if (!DASHBOARD_THIRDWEB_SECRET_KEY) {
+    return notFound();
+  }
+
+  const client = getConfiguredThirdwebClient({
+    secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+    teamId: undefined,
+  });
+
   // eslint-disable-next-line no-restricted-syntax
   const chain = defineDashboardChain(project.chainId, undefined);
 
   const contract = getContract({
     address: project.contractAddress,
     chain,
-    client: serverThirdwebClient,
+    client,
   });
 
   const [nft, claimCondition, contractMetadata] = await Promise.all([
@@ -92,7 +104,7 @@ export default async function DropPage({
         contract: getContract({
           address: claimCondition.currency,
           chain,
-          client: serverThirdwebClient,
+          client,
         }),
       })
     : undefined;

apps/dashboard/src/app/(app)/layout.tsx

@@ -1,7 +1,6 @@
 import "../../global.css";
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
-import PlausibleProvider from "next-plausible";
 import NextTopLoader from "nextjs-toploader";
 import { DashboardRouterTopProgressBar } from "@/lib/DashboardRouter";
 import { cn } from "@/lib/utils";
@@ -52,14 +51,6 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en" suppressHydrationWarning>
-      <head>
-        <PlausibleProvider
-          customDomain="https://pl.thirdweb.com"
-          domain="thirdweb.com"
-          selfHosted
-        />
-      </head>
-
       <body
         className={cn("bg-background font-sans antialiased", fontSans.variable)}
       >

apps/dashboard/src/app/(app)/login/onboarding/team-onboarding/InviteTeamMembers.tsx

@@ -87,8 +87,7 @@ export function InviteTeamMembersUI(props: {
         client={props.client}
         customCTASection={
           <div className="flex gap-3">
-            {(props.team.billingPlan === "free" ||
-              props.team.billingPlan === "starter") && (
+            {props.team.billingPlan === "free" && (
               <Button
                 className="gap-2"
                 onClick={() => {

apps/dashboard/src/app/(app)/project-showcase/[slug]/page.tsx

@@ -9,7 +9,8 @@ import {
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import { PROJECT_SHOWCASE_DATA } from "@/lib/project-showcase-constants";
 import { resolveSchemeWithErrorHandler } from "@/utils/resolveSchemeWithErrorHandler";
 
@@ -78,9 +79,13 @@ export default async function DetailPage(props: {
                 className="rounded-b-lg object-cover md:rounded-r-lg md:rounded-bl-none"
                 height={500}
                 src={
-                  project.image?.startsWith("ipfs://")
+                  project.image?.startsWith("ipfs://") &&
+                  DASHBOARD_THIRDWEB_SECRET_KEY
                     ? (resolveSchemeWithErrorHandler({
-                        client: serverThirdwebClient,
+                        client: getConfiguredThirdwebClient({
+                          secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+                          teamId: undefined,
+                        }),
                         uri: project.image,
                       }) ?? "")
                     : (project.image ?? "/assets/showcase/default_image.png")

apps/dashboard/src/app/(app)/project-showcase/page.tsx

@@ -19,7 +19,8 @@ import {
   PaginationNext,
   PaginationPrevious,
 } from "@/components/ui/pagination";
-import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { getConfiguredThirdwebClient } from "@/constants/thirdweb.server";
 import {
   PROJECT_SHOWCASE_DATA,
   PROJECT_SHOWCASE_INDUSTRIES,
@@ -138,9 +139,13 @@ export default async function ProjectShowcasePage(props: {
                       className="h-48 w-full object-cover"
                       height={200}
                       src={
-                        project.image?.startsWith("ipfs://")
+                        project.image?.startsWith("ipfs://") &&
+                        DASHBOARD_THIRDWEB_SECRET_KEY
                           ? (resolveSchemeWithErrorHandler({
-                              client: serverThirdwebClient,
+                              client: getConfiguredThirdwebClient({
+                                secretKey: DASHBOARD_THIRDWEB_SECRET_KEY,
+                                teamId: undefined,
+                              }),
                               uri: project.image,
                             }) ?? "")
                           : (project.image ??

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

@@ -0,0 +1,120 @@
+"use client";
+import {
+  BookTextIcon,
+  BoxIcon,
+  ChartNoAxesColumnIcon,
+  DatabaseIcon,
+  DollarSignIcon,
+  FileTextIcon,
+  HomeIcon,
+  SettingsIcon,
+  WalletCardsIcon,
+} from "lucide-react";
+import { FullWidthSidebarLayout } from "@/components/blocks/full-width-sidebar-layout";
+
+export function TeamSidebarLayout(props: {
+  layoutPath: string;
+  children: React.ReactNode;
+  ecosystems: Array<{ name: string; slug: string }>;
+  chainSubscriptions: Array<{
+    chainId: number;
+    chainName: string;
+    slug: string;
+  }>;
+}) {
+  const { layoutPath, children } = props;
+
+  return (
+    <FullWidthSidebarLayout
+      contentSidebarLinks={[
+        {
+          exactMatch: true,
+          href: layoutPath,
+          icon: HomeIcon,
+          label: "Overview",
+        },
+        {
+          href: `${layoutPath}/~/analytics`,
+          icon: ChartNoAxesColumnIcon,
+          label: "Analytics",
+        },
+        {
+          links: [
+            ...props.ecosystems.map((ecosystem) => ({
+              href: `${layoutPath}/~/ecosystem/${ecosystem.slug}`,
+              label: ecosystem.name,
+            })),
+            {
+              href: `${layoutPath}/~/ecosystem/create`,
+              label: "Create Ecosystem",
+            },
+          ],
+          subMenu: {
+            icon: WalletCardsIcon,
+            label: "Ecosystems",
+          },
+        },
+        {
+          href: `${layoutPath}/~/audit-log`,
+          icon: FileTextIcon,
+          label: "Audit Log",
+        },
+        {
+          href: `${layoutPath}/~/usage`,
+          icon: DatabaseIcon,
+          label: "Usage",
+        },
+        ...(props.chainSubscriptions.length > 0
+          ? [
+              {
+                separator: true,
+              } as const,
+              {
+                links: [
+                  ...props.chainSubscriptions.map((chainSubscription) => ({
+                    href: `${layoutPath}/~/infrastructure/${chainSubscription.slug}`,
+                    label: chainSubscription.chainName,
+                  })),
+                  {
+                    href: `${layoutPath}/~/infrastructure/deploy`,
+                    label: "Deploy Infrastructure",
+                  },
+                ],
+                subMenu: {
+                  icon: WalletCardsIcon,
+                  label: "Chain Infrastucture",
+                },
+              },
+            ]
+          : []),
+      ]}
+      footerSidebarLinks={[
+        {
+          href: `${layoutPath}/~/billing`,
+          icon: DollarSignIcon,
+          label: "Billing",
+        },
+        {
+          href: `${layoutPath}/~/settings`,
+          icon: SettingsIcon,
+          label: "Team Settings",
+        },
+        {
+          separator: true,
+        },
+        {
+          href: "https://portal.thirdweb.com",
+          icon: BookTextIcon,
+          label: "Documentation",
+        },
+        {
+          href: "https://playground.thirdweb.com/connect/sign-in/button",
+          icon: BoxIcon,
+          label: "Playground",
+        },
+      ]}
+    >
+      {children}
+    </FullWidthSidebarLayout>
+  );
+}

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

@@ -54,7 +54,7 @@ function BillingAlertBanner(props: {
             "border border-red-600 bg-red-100 text-red-800 hover:bg-red-200 dark:border-red-700 dark:bg-red-900 dark:text-red-100 dark:hover:bg-red-800",
         )}
       >
-        <Link href={`/team/${props.teamSlug}/~/settings/invoices`}>
+        <Link href={`/team/${props.teamSlug}/~/billing/invoices`}>
           {props.ctaLabel}
         </Link>
       </Button>

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

@@ -18,7 +18,7 @@ export function FreePlanUpsellBannerUI(props: {
       accentColor="green"
       cta={{
         icon: <ArrowRightIcon className="size-4" />,
-        link: `/team/${props.teamSlug}/~/settings/billing?showPlans=true&highlight=${
+        link: `/team/${props.teamSlug}/~/billing?showPlans=true&highlight=${
           props.highlightPlan || "growth"
         }`,
         text: "View plans",

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

@@ -0,0 +1,29 @@
+import { ArrowRightIcon } from "lucide-react";
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
+
+export function StaffModeNotice() {
+  return (
+    <div className="dark:bg-orange-800 bg-orange-200 border-b px-5">
+      <div className="flex items-center justify-between py-3">
+        <div className="flex flex-col">
+          <p className="font-bold text-lg tracking-tight">Staff Mode</p>
+          <p className="text-sm text-foreground/80">
+            You can only view this team, not take any actions.
+          </p>
+        </div>
+        <Button
+          asChild
+          className="rounded-full gap-1.5"
+          size="sm"
+          variant="default"
+        >
+          <Link href="/team/~">
+            Leave Staff Mode
+            <ArrowRightIcon className="size-4" />
+          </Link>
+        </Button>
+      </div>
+    </div>
+  );
+}

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

@@ -1,17 +1,19 @@
-import Link from "next/link";
 import { redirect } from "next/navigation";
 import { getAuthToken, getAuthTokenWalletAddress } from "@/api/auth-token";
+import { fetchEcosystemList } from "@/api/ecosystems";
 import { getProjects } from "@/api/projects";
 import { getTeamBySlug, getTeams } from "@/api/team";
+import { getChainSubscriptions } from "@/api/team-subscription";
 import { CustomChatButton } from "@/components/chat/CustomChatButton";
-import { AppFooter } from "@/components/footers/app-footer";
 import { AnnouncementBanner } from "@/components/misc/AnnouncementBanner";
-import { Button } from "@/components/ui/button";
-import { TabPathLinks } from "@/components/ui/tabs";
+import { SidebarProvider } from "@/components/ui/sidebar";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
+import { getChain } from "../../../(dashboard)/(chain)/utils";
 import { siwaExamplePrompts } from "../../../(dashboard)/support/definitions";
 import { getValidAccount } from "../../../account/settings/getAccount";
 import { TeamHeaderLoggedIn } from "../../components/TeamHeader/team-header-logged-in.client";
+import { StaffModeNotice } from "./_components/StaffModeNotice";
+import { TeamSidebarLayout } from "./TeamSidebarLayout";
 
 export default async function TeamLayout(props: {
   children: React.ReactNode;
@@ -19,105 +21,102 @@ export default async function TeamLayout(props: {
 }) {
   const params = await props.params;
 
-  const [accountAddress, account, teams, authToken, team] = await Promise.all([
+  const [
+    accountAddress,
+    account,
+    teams,
+    authToken,
+    team,
+    ecosystems,
+    chainSubscriptions,
+  ] = await Promise.all([
     getAuthTokenWalletAddress(),
     getValidAccount(`/team/${params.team_slug}`),
     getTeams(),
     getAuthToken(),
     getTeamBySlug(params.team_slug),
+    fetchEcosystemList(params.team_slug),
+    getChainSubscriptions(params.team_slug),
   ]);
 
   if (!teams || !accountAddress || !authToken || !team) {
     redirect("/login");
   }
 
-  const teamsAndProjects = await Promise.all(
-    teams.map(async (team) => ({
-      projects: await getProjects(team.slug),
-      team,
-    })),
-  );
+  const [teamsAndProjects, chainSidebarLinks] = await Promise.all([
+    Promise.all(
+      teams.map(async (team) => ({
+        projects: await getProjects(team.slug),
+        team,
+      })),
+    ),
+    chainSubscriptions
+      ? await Promise.all(
+          chainSubscriptions.map(async (chainSubscription) => {
+            if (!chainSubscription.chainId) {
+              throw new Error("Chain ID is required");
+            }
+            const chain = await getChain(chainSubscription.chainId);
+
+            return {
+              chainId: chain.chainId,
+              chainName: chain.name,
+              slug: chain.slug,
+            };
+          }),
+        ).catch(() => [])
+      : [],
+  ]);
 
   const client = getClientThirdwebClient({
     jwt: authToken,
     teamId: team.id,
   });
 
+  const isStaffMode = !teams.some((t) => t.slug === team.slug);
+
   return (
-    <div className="flex h-full grow flex-col">
-      {!teams.some((t) => t.slug === team.slug) && (
-        <div className="bg-warning-text">
-          <div className="container flex items-center justify-between py-4">
-            <div className="flex flex-col gap-2">
-              <p className="font-bold text-white text-xl">👀 STAFF MODE 👀</p>
-              <p className="text-sm text-white">
-                You can only view this team, not take any actions.
-              </p>
-            </div>
-            <Button asChild variant="default">
-              <Link href="/team/~">Leave Staff Mode</Link>
-            </Button>
-          </div>
+    <SidebarProvider>
+      <div className="flex h-dvh min-w-0 grow flex-col">
+        {isStaffMode && <StaffModeNotice />}
+        <AnnouncementBanner />
+        <div className="bg-card border-b">
+          <TeamHeaderLoggedIn
+            account={account}
+            accountAddress={accountAddress}
+            client={client}
+            currentProject={undefined}
+            currentTeam={team}
+            teamsAndProjects={teamsAndProjects}
+          />
         </div>
-      )}
-      <AnnouncementBanner />
-      <div className="bg-card">
-        <TeamHeaderLoggedIn
-          account={account}
-          accountAddress={accountAddress}
-          client={client}
-          currentProject={undefined}
-          currentTeam={team}
-          teamsAndProjects={teamsAndProjects}
-        />
 
-        <TabPathLinks
-          links={[
-            {
-              exactMatch: true,
-              name: "Overview",
-              path: `/team/${params.team_slug}`,
-            },
-            {
-              name: "Analytics",
-              path: `/team/${params.team_slug}/~/analytics`,
-            },
-            {
-              name: "Ecosystems",
-              path: `/team/${params.team_slug}/~/ecosystem`,
-            },
-            {
-              name: "Usage",
-              path: `/team/${params.team_slug}/~/usage`,
-            },
-            {
-              name: "Audit Log",
-              path: `/team/${params.team_slug}/~/audit-log`,
-            },
-            {
-              name: "Settings",
-              path: `/team/${params.team_slug}/~/settings`,
-            },
-          ]}
-          tabContainerClassName="px-4 lg:px-6"
-        />
+        <TeamSidebarLayout
+          chainSubscriptions={chainSidebarLinks.sort(
+            (a, b) => a.chainId - b.chainId,
+          )}
+          ecosystems={ecosystems.map((ecosystem) => ({
+            name: ecosystem.name,
+            slug: ecosystem.slug,
+          }))}
+          layoutPath={`/team/${params.team_slug}`}
+        >
+          {props.children}
+        </TeamSidebarLayout>
+        <div className="fixed right-6 bottom-6 z-50">
+          <CustomChatButton
+            authToken={authToken}
+            clientId={undefined}
+            examplePrompts={siwaExamplePrompts}
+            isFloating={true}
+            isLoggedIn={true}
+            label="Ask AI Assistant"
+            networks="all"
+            pageType="support"
+            teamId={team.id}
+          />
+        </div>
       </div>
-
-      <main className="flex grow flex-col">{props.children}</main>
-      <div className="fixed right-6 bottom-6 z-50">
-        <CustomChatButton
-          authToken={authToken}
-          clientId={undefined}
-          examplePrompts={siwaExamplePrompts}
-          isFloating={true}
-          isLoggedIn={true}
-          label="Ask AI Assistant"
-          networks="all"
-          pageType="support"
-          teamId={team.id}
-        />
-      </div>
-      <AppFooter />
-    </div>
+    </SidebarProvider>
   );
 }

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

@@ -73,7 +73,8 @@ export default async function TeamOverviewPage(props: {
           title="Analytics"
         />
       </div>
-      <div className="flex grow flex-col justify-between gap-10 md:container md:pt-8 md:pb-16">
+
+      <div className="flex grow flex-col justify-between gap-10 container max-w-7xl pt-8 pb-16">
         <div className="flex grow flex-col gap-6">
           <Suspense
             fallback={<LoadingChartState className="h-[458px] border" />}
@@ -86,7 +87,7 @@ export default async function TeamOverviewPage(props: {
             />
           </Suspense>
 
-          <div className="grid gap-6 max-md:px-6 md:grid-cols-2">
+          <div className="grid gap-6 md:grid-cols-2">
             <Suspense
               fallback={<LoadingChartState className="h-[431px] border" />}
             >
@@ -168,7 +169,7 @@ async function AsyncAppHighlightsCard(props: {
   return (
     <EmptyStateCard
       link="https://portal.thirdweb.com/connect/quickstart"
-      metric="Connect"
+      metric="Wallets"
     />
   );
 }
@@ -189,7 +190,7 @@ async function AsyncWalletDistributionCard(props: {
   ) : (
     <EmptyStateCard
       link="https://portal.thirdweb.com/connect/quickstart"
-      metric="Connect"
+      metric="Wallets"
     />
   );
 }
@@ -210,7 +211,7 @@ async function AsyncAuthMethodDistributionCard(props: {
   ) : (
     <EmptyStateCard
       link="https://portal.thirdweb.com/typescript/v5/inAppWallet"
-      metric="In-App Wallets"
+      metric="Wallets"
     />
   );
 }
@@ -242,14 +243,13 @@ async function AsyncTransactionsChartCard(props: {
     clientTransactions.value.length > 0 ? (
     <TransactionsChartCardUI
       aggregatedData={clientTransactions.value}
-      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
       data={clientTransactionsTimeSeries.value}
       searchParams={props.searchParams}
     />
   ) : (
     <EmptyStateCard
       link="https://portal.thirdweb.com/connect/quickstart"
-      metric="Transactions"
+      metric="Wallets"
     />
   );
 }
@@ -280,14 +280,13 @@ async function AsyncTotalSponsoredCard(props: {
     userOpUsage.value.length > 0 ? (
     <TotalSponsoredChartCardUI
       aggregatedData={userOpUsage.value}
-      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
       data={userOpUsageTimeSeries.value}
       searchParams={props.searchParams}
     />
   ) : (
     <EmptyStateCard
       link="https://portal.thirdweb.com/typescript/v5/account-abstraction/get-started"
-      metric="Gas Sponsored"
+      metric="Account Abstraction"
     />
   );
 }
@@ -391,7 +390,6 @@ function AppHighlightsCard({
         return timeSeriesData.reduce((acc, curr) => acc + curr[key], 0);
       }}
       chartConfig={chartConfig}
-      className="max-md:rounded-none max-md:border-r-0 max-md:border-l-0"
       data={timeSeriesData}
       existingQueryParams={searchParams}
       queryKey="appHighlights"

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/layout.tsx

@@ -24,13 +24,15 @@ export default async function Layout(props: {
     >
       <div className="flex grow flex-col">
         <div className="border-border border-b py-10">
-          <div className="container flex flex-row justify-between">
+          <div className="container max-w-5xl flex flex-row justify-between">
             <h1 className="font-semibold text-3xl tracking-tight lg:px-2">
               Audit Log
             </h1>
           </div>
         </div>
-        {props.children}
+        <div className="container max-w-5xl flex flex-col gap-8 pt-6 pb-10">
+          {props.children}
+        </div>
       </div>
     </UpsellWrapper>
   );

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/audit-log/page.tsx

@@ -47,7 +47,7 @@ export default async function Page(props: {
   }
 
   return (
-    <div className="container flex flex-col gap-8">
+    <div className="flex flex-col gap-8">
       {auditLogs.data.result.length === 0 ? (
         <div className="py-12 text-center text-muted-foreground">
           <p className="text-sm">No audit events found</p>

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

@@ -237,7 +237,7 @@ export function PlanInfoCardUI(props: {
               size="sm"
               variant="outline"
             >
-              <Link href={`/team/${team.slug}/~/settings/invoices`}>
+              <Link href={`/team/${team.slug}/~/billing/invoices`}>
                 <FileTextIcon className="size-4 text-muted-foreground" />
                 View Invoices
               </Link>

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/billing/components/credit-balance-section.client.tsx

@@ -16,7 +16,7 @@ import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { Separator } from "@/components/ui/separator";
 import { Skeleton } from "@/components/ui/skeleton";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import { ThirdwebMiniLogo } from "../../../../../../../components/ThirdwebMiniLogo";
+import { ThirdwebMiniLogo } from "../../../../../../components/ThirdwebMiniLogo";
 
 const predefinedAmounts = [
   { label: "$25", value: "25" },

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

@@ -19,7 +19,7 @@ export default async function Page(props: {
     searchParamLoader(props.searchParams),
   ]);
 
-  const pagePath = `/team/${params.team_slug}/settings/invoices`;
+  const pagePath = `/team/${params.team_slug}/invoices`;
 
   const account = await getValidAccount(pagePath);
 

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

@@ -0,0 +1,56 @@
+import { redirect } from "next/navigation";
+import { getAuthToken } from "@/api/auth-token";
+import { getTeamBySlug } from "@/api/team";
+import { TabPathLinks } from "@/components/ui/tabs";
+import { loginRedirect } from "../../../../../login/loginRedirect";
+
+export default async function Layout(props: {
+  params: Promise<{
+    team_slug: string;
+  }>;
+  children: React.ReactNode;
+}) {
+  const params = await props.params;
+
+  const [team, authToken] = await Promise.all([
+    getTeamBySlug(params.team_slug),
+    getAuthToken(),
+  ]);
+
+  if (!authToken) {
+    loginRedirect(`/team/${params.team_slug}/~/settings`);
+  }
+
+  if (!team) {
+    redirect("/team");
+  }
+
+  return (
+    <div className="flex grow flex-col">
+      <div className="border-border pt-10 pb-6">
+        <div className="container max-w-6xl">
+          <h1 className="font-semibold text-3xl tracking-tight">Billing</h1>
+        </div>
+      </div>
+
+      <TabPathLinks
+        links={[
+          {
+            exactMatch: true,
+            name: "Overview",
+            path: `/team/${params.team_slug}/~/billing`,
+          },
+          {
+            name: "Invoices",
+            path: `/team/${params.team_slug}/~/billing/invoices`,
+          },
+        ]}
+        scrollableClassName="container max-w-6xl"
+      />
+
+      <div className="container max-w-6xl flex flex-col grow gap-8 pt-6 pb-10">
+        {props.children}
+      </div>
+    </div>
+  );
+}

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

@@ -7,7 +7,7 @@ import { getTeamSubscriptions } from "@/api/team-subscription";
 import { CreditsInfoCard } from "@/components/billing/PlanCard";
 import { Coupons } from "@/components/billing/SubscriptionCoupons/Coupons";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { getValidAccount } from "../../../../../../account/settings/getAccount";
+import { getValidAccount } from "../../../../../account/settings/getAccount";
 import { CreditBalanceSection } from "./components/credit-balance-section.client";
 import { PlanInfoCardClient } from "./components/PlanInfoCard.client";
 
@@ -24,7 +24,7 @@ export default async function Page(props: {
     props.params,
     props.searchParams,
   ]);
-  const pagePath = `/team/${params.team_slug}/settings/billing`;
+  const pagePath = `/team/${params.team_slug}/billing`;
 
   const account = await getValidAccount(pagePath);
 
@@ -64,7 +64,7 @@ export default async function Page(props: {
     team.billingStatus === "validPayment" || team.billingStatus === "pastDue";
 
   return (
-    <div className="flex flex-col gap-12">
+    <div className="flex flex-col gap-8">
       <div>
         <PlanInfoCardClient
           highlightPlan={highlightPlan}

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemAnalyticsPage.tsx

@@ -1,10 +1,10 @@
 import { getEcosystemWalletUsage } from "@/api/analytics";
+import type { Partner } from "@/api/ecosystems";
 import {
   getLastNDaysRange,
   type Range,
 } from "@/components/analytics/date-range-selector";
 import { RangeSelector } from "@/components/analytics/range-selector";
-import type { Partner } from "../../../../types";
 import { EcosystemWalletUsersChartCard } from "./EcosystemWalletUsersChartCard";
 import { EcosystemWalletsSummary } from "./Summary";
 

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/analytics/components/EcosystemWalletUsersChartCard.tsx

@@ -1,6 +1,7 @@
 "use client";
 import { format } from "date-fns";
 import { useMemo } from "react";
+import type { Partner } from "@/api/ecosystems";
 import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
 import { DocLink } from "@/components/blocks/DocLink";
 import { ExportToCSVButton } from "@/components/blocks/ExportToCSVButton";
@@ -10,7 +11,6 @@ import { TypeScriptIcon } from "@/icons/brand-icons/TypeScriptIcon";
 import { UnityIcon } from "@/icons/brand-icons/UnityIcon";
 import type { EcosystemWalletStats } from "@/types/analytics";
 import { formatTickerNumber } from "@/utils/format-utils";
-import type { Partner } from "../../../../types";
 
 type ChartData = Record<string, number> & {
   time: string; // human readable date

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

@@ -1,7 +1,7 @@
 import { redirect } from "next/navigation";
+import { getAuthToken } from "@/api/auth-token";
+import { fetchEcosystem } from "@/api/ecosystems";
 import { getTeamBySlug } from "@/api/team";
-import { getAuthToken } from "../../../../../../../../../../@/api/auth-token";
-import { fetchEcosystem } from "../../../utils/fetchEcosystem";
 import { fetchPartners } from "../configuration/hooks/fetchPartners";
 import { EcosystemAnalyticsPage } from "./components/EcosystemAnalyticsPage";
 
@@ -29,7 +29,7 @@ export default async function Page(props: {
   }
 
   const [ecosystem, team] = await Promise.all([
-    fetchEcosystem(params.slug, authToken, params.team_slug),
+    fetchEcosystem(params.slug, params.team_slug),
     getTeamBySlug(params.team_slug),
   ]);
 

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

@@ -1,9 +1,9 @@
 import { redirect } from "next/navigation";
+import { getAuthToken } from "@/api/auth-token";
+import { fetchEcosystem } from "@/api/ecosystems";
 import { getTeamBySlug } from "@/api/team";
-import { SidebarLayout } from "@/components/blocks/SidebarLayout";
+import { TabPathLinks } from "@/components/ui/tabs";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { getAuthToken } from "../../../../../../../../../../@/api/auth-token";
-import { fetchEcosystem } from "../../../utils/fetchEcosystem";
 import { EcosystemHeader } from "./ecosystem-header.client";
 
 export async function EcosystemLayoutSlug({
@@ -21,11 +21,7 @@ export async function EcosystemLayoutSlug({
     redirect(ecosystemLayoutPath);
   }
 
-  const ecosystem = await fetchEcosystem(
-    params.slug,
-    authToken,
-    params.team_slug,
-  );
+  const ecosystem = await fetchEcosystem(params.slug, params.team_slug);
 
   // Fetch team details to obtain team ID for further authenticated updates
   const team = await getTeamBySlug(params.team_slug);
@@ -54,25 +50,28 @@ export async function EcosystemLayoutSlug({
         teamIdOrSlug={params.team_slug}
       />
 
-      <SidebarLayout
-        sidebarLinks={[
+      <TabPathLinks
+        className="pt-2"
+        links={[
           {
             exactMatch: true,
-            href: `${ecosystemLayoutPath}/${ecosystem.slug}`,
-            label: "Overview",
+            name: "Overview",
+            path: `${ecosystemLayoutPath}/${ecosystem.slug}`,
           },
           {
-            href: `${ecosystemLayoutPath}/${ecosystem.slug}/analytics`,
-            label: "Analytics",
+            name: "Analytics",
+            path: `${ecosystemLayoutPath}/${ecosystem.slug}/analytics`,
           },
           {
-            href: `${ecosystemLayoutPath}/${ecosystem.slug}#`,
-            label: "Design (coming soon)",
+            name: "Design (coming soon)",
+            path: `${ecosystemLayoutPath}/${ecosystem.slug}/#`,
           },
         ]}
-      >
+        scrollableClassName="container max-w-7xl"
+      />
+      <div className="container max-w-7xl flex flex-col grow pt-6 pb-10">
         {children}
-      </SidebarLayout>
+      </div>
     </div>
   );
 }

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

@@ -1,17 +1,10 @@
 "use client";
-import {
-  AlertTriangleIcon,
-  CheckIcon,
-  ChevronsUpDownIcon,
-  ExternalLinkIcon,
-  PencilIcon,
-  PlusCircleIcon,
-} from "lucide-react";
+import { AlertTriangleIcon, ExternalLinkIcon, PencilIcon } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
-/* eslint-disable */
+import type { Ecosystem } from "@/api/ecosystems";
 import { Img } from "@/components/blocks/Img";
 import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 import { Button } from "@/components/ui/button";
@@ -25,14 +18,6 @@ import {
   DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuGroup,
-  DropdownMenuItem,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
 import { ImageUpload } from "@/components/ui/image-upload";
 import { Input } from "@/components/ui/input";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
@@ -41,8 +26,6 @@ import { useDashboardStorageUpload } from "@/hooks/useDashboardStorageUpload";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { cn } from "@/lib/utils";
 import { resolveSchemeWithErrorHandler } from "@/utils/resolveSchemeWithErrorHandler";
-import { useEcosystemList } from "../../../hooks/use-ecosystem-list";
-import type { Ecosystem } from "../../../types";
 import { useUpdateEcosystem } from "../configuration/hooks/use-update-ecosystem";
 import { useEcosystem } from "../hooks/use-ecosystem";
 
@@ -78,56 +61,6 @@ function EcosystemAlertBanner({ ecosystem }: { ecosystem: Ecosystem }) {
   }
 }
 
-function EcosystemSelect(props: {
-  ecosystem: Ecosystem;
-  ecosystemLayoutPath: string;
-  teamIdOrSlug: string;
-}) {
-  const { data: ecosystems, isPending } = useEcosystemList({
-    teamIdOrSlug: props.teamIdOrSlug,
-  });
-
-  return isPending ? (
-    <Skeleton className="h-10 w-full md:w-[160px]" />
-  ) : (
-    <DropdownMenu>
-      <DropdownMenuTrigger asChild>
-        <Button
-          className="relative flex w-full justify-start truncate pr-8 pl-3 md:w-48"
-          variant="outline"
-        >
-          <div className="truncate">{props.ecosystem?.name}</div>
-          <ChevronsUpDownIcon className="absolute right-2 h-4 w-4 text-muted-foreground" />
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent className="w-full md:w-48">
-        <DropdownMenuGroup>
-          {ecosystems?.map((ecosystem) => (
-            <DropdownMenuItem asChild key={ecosystem.id}>
-              <Link
-                className="relative flex cursor-pointer items-center pr-3 pl-8"
-                href={`${props.ecosystemLayoutPath}/${ecosystem.slug}`}
-              >
-                {ecosystem.slug === props.ecosystem.slug && (
-                  <CheckIcon className="absolute left-2 h-4 w-4 text-foreground" />
-                )}
-                <div className="truncate">{ecosystem.name}</div>
-              </Link>
-            </DropdownMenuItem>
-          ))}
-        </DropdownMenuGroup>
-        <DropdownMenuSeparator />
-        <Link className="" href={`${props.ecosystemLayoutPath}/create`}>
-          <DropdownMenuItem className="relative flex cursor-pointer items-center pr-3 pl-8">
-            <PlusCircleIcon className="absolute left-2 h-4 w-4" />
-            <div className="truncate">New Ecosystem</div>
-          </DropdownMenuItem>
-        </Link>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-}
-
 export function EcosystemHeader(props: {
   ecosystem: Ecosystem;
   ecosystemLayoutPath: string;
@@ -236,8 +169,8 @@ export function EcosystemHeader(props: {
   }
 
   return (
-    <div className="border-b py-8">
-      <div className="container flex flex-col gap-8">
+    <div className="pt-8 pb-4">
+      <div className="container max-w-7xl flex flex-col gap-8">
         <EcosystemAlertBanner ecosystem={ecosystem} />
         <header className="flex flex-col gap-12">
           <div className="flex flex-col justify-between gap-4 md:grid-cols-4 md:flex-row">
@@ -402,13 +335,6 @@ export function EcosystemHeader(props: {
                 )}
               </div>
             </div>
-            <div className="flex flex-col justify-between gap-4 md:items-end">
-              <EcosystemSelect
-                ecosystem={ecosystem}
-                ecosystemLayoutPath={props.ecosystemLayoutPath}
-                teamIdOrSlug={props.teamIdOrSlug}
-              />
-            </div>
           </div>
         </header>
       </div>

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/add-partner/page.tsx

@@ -1,10 +1,10 @@
 import { notFound } from "next/navigation";
+import { getAuthToken } from "@/api/auth-token";
+import { fetchEcosystem } from "@/api/ecosystems";
 import { getTeamBySlug } from "@/api/team";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { getAuthToken } from "../../../../../../../../../../../@/api/auth-token";
 import { loginRedirect } from "../../../../../../../../../login/loginRedirect";
 import { AddPartnerForm } from "../components/client/add-partner-form.client";
-import { fetchEcosystem } from "../hooks/fetchEcosystem";
 
 export default async function AddPartnerPage({
   params,
@@ -34,11 +34,10 @@ export default async function AddPartnerPage({
   });
 
   try {
-    const ecosystem = await fetchEcosystem({
-      authToken,
-      slug: ecosystemSlug,
-      teamIdOrSlug: teamSlug,
-    });
+    const ecosystem = await fetchEcosystem(ecosystemSlug, teamSlug);
+    if (!ecosystem) {
+      throw new Error("Ecosystem not found");
+    }
 
     return (
       <div className="flex flex-col">

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

@@ -2,8 +2,8 @@
 
 import { PlusIcon } from "lucide-react";
 import Link from "next/link";
+import type { Ecosystem } from "@/api/ecosystems";
 import { Button } from "@/components/ui/button";
-import type { Ecosystem } from "../../../../../types";
 
 export function AddPartnerDialogButton(props: {
   teamSlug: string;

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

@@ -2,8 +2,8 @@
 import { useParams } from "next/navigation";
 import { toast } from "sonner";
 import type { ThirdwebClient } from "thirdweb";
+import type { Ecosystem, Partner } from "@/api/ecosystems";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import type { Ecosystem, Partner } from "../../../../../types";
 import { useAddPartner } from "../../hooks/use-add-partner";
 import { PartnerForm, type PartnerFormValues } from "./partner-form.client";
 

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

@@ -12,6 +12,7 @@ import {
 } from "thirdweb/wallets/smart";
 import invariant from "tiny-invariant";
 import { z } from "zod";
+import type { AuthOption, Ecosystem } from "@/api/ecosystems";
 import { SingleNetworkSelector } from "@/components/blocks/NetworkSelectors";
 import { SettingsCard } from "@/components/blocks/SettingsCard";
 import { Button } from "@/components/ui/button";
@@ -36,9 +37,28 @@ import {
 import { Skeleton } from "@/components/ui/skeleton";
 import { Switch } from "@/components/ui/switch";
 import { cn } from "@/lib/utils";
-import { authOptions, type Ecosystem } from "../../../../../types";
 import { useUpdateEcosystem } from "../../hooks/use-update-ecosystem";
 
+const authOptions = [
+  "email",
+  "phone",
+  "passkey",
+  "siwe",
+  "guest",
+  "google",
+  "facebook",
+  "x",
+  "discord",
+  "farcaster",
+  "telegram",
+  "github",
+  "twitch",
+  "steam",
+  "apple",
+  "coinbase",
+  "line",
+] as const satisfies AuthOption[];
+
 type AuthOptionsFormData = {
   authOptions: string[];
   useCustomAuth: boolean;
@@ -113,6 +133,8 @@ export function AuthOptionsForm({
           (data) => {
             if (
               data.useSmartAccount &&
+              data.executionMode === "EIP4337" &&
+              data.accountFactoryType === "custom" &&
               data.customAccountFactoryAddress &&
               !isAddress(data.customAccountFactoryAddress)
             ) {
@@ -125,6 +147,23 @@ export function AuthOptionsForm({
             path: ["customAccountFactoryAddress"],
           },
         )
+        .refine(
+          (data) => {
+            if (
+              data.useSmartAccount &&
+              data.executionMode === "EIP4337" &&
+              data.accountFactoryType === "custom" &&
+              !data.customAccountFactoryAddress
+            ) {
+              return false;
+            }
+            return true;
+          },
+          {
+            message: "Please enter a custom account factory address",
+            path: ["customAccountFactoryAddress"],
+          },
+        )
         .refine(
           (data) => {
             if (data.useSmartAccount && (data.defaultChainId ?? 0) <= 0) {
@@ -193,21 +232,23 @@ export function AuthOptionsForm({
 
     let smartAccountOptions: Ecosystem["smartAccountOptions"] | null = null;
     if (data.useSmartAccount) {
-      let accountFactoryAddress: string;
-      switch (data.accountFactoryType) {
-        case "v0.6":
-          accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_6;
-          break;
-        case "v0.7":
-          accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_7;
-          break;
-        case "custom":
-          if (!data.customAccountFactoryAddress) {
-            toast.error("Please enter a custom account factory address");
-            return;
-          }
-          accountFactoryAddress = data.customAccountFactoryAddress;
-          break;
+      let accountFactoryAddress: string | undefined;
+      if (data.executionMode === "EIP4337") {
+        switch (data.accountFactoryType) {
+          case "v0.6":
+            accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_6;
+            break;
+          case "v0.7":
+            accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_7;
+            break;
+          case "custom":
+            if (!data.customAccountFactoryAddress) {
+              toast.error("Please enter a custom account factory address");
+              return;
+            }
+            accountFactoryAddress = data.customAccountFactoryAddress;
+            break;
+        }
       }
 
       smartAccountOptions = {
@@ -220,7 +261,7 @@ export function AuthOptionsForm({
 
     updateEcosystem({
       ...ecosystem,
-      authOptions: data.authOptions as (typeof authOptions)[number][],
+      authOptions: data.authOptions as AuthOption[],
       customAuthOptions,
       smartAccountOptions,
     });