Version Packages (#6691 )

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
[SDK] Add smartAccountAddress to getUser result (#6690 )
2025-04-10 12:55:22 -07:00 · 2025-04-10 12:17:31 -07:00 · 2025-04-10 19:20:31 +02:00 · 2025-04-10 19:17:19 +02:00 · 2025-04-10 12:59:07 +00:00 · 2025-04-10 12:42:27 +00:00
540 changed files with 19200 additions and 13453 deletions
@@ -60,7 +60,7 @@ jobs:
        uses: ./.github/composite-actions/install

      - name: Setup Biome
-        uses: biomejs/setup-biome@c016c38f26f2c4a6eb3662679143614a254263fd # v2.3.0
+        uses: biomejs/setup-biome@f382a98e582959e6aaac8e5f8b17b31749018780 # v2.5.0
        with:
          version: latest  

@@ -28,23 +28,3 @@ jobs:

      - name: Run TypeDoc
        run: pnpm typedoc
-
-      - name: Update Gist
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          github-token: ${{ secrets.GIST_TOKEN }}
-          script: |
-            const fs = require('fs');
-            const content = fs.readFileSync('./packages/thirdweb/typedoc/parsed.json', 'utf8');
-            const gistId = '678fe1f331a01270bb002fee660f285d';
-            
-            await github.rest.gists.update({
-              gist_id: gistId,
-              files: {
-                'data.json': {
-                  content: content
-                }
-              }
-            });
-          
-            console.log(`Permalink: https://gist.githubusercontent.com/raw/${gistId}/data.json`);
@@ -0,0 +1,2 @@
+public-hoist-pattern[]=*import-in-the-middle*
+public-hoist-pattern[]=*require-in-the-middle*
@@ -1,5 +1,5 @@
 import type { Preview } from "@storybook/react";
-import "@/styles/globals.css";
+import "../src/global.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { MoonIcon, SunIcon } from "lucide-react";
 import { ThemeProvider, useTheme } from "next-themes";
@@ -81,23 +81,18 @@ function StoryLayout(props: {
  return (
    <QueryClientProvider client={queryClient}>
      <div className="flex min-h-dvh min-w-0 flex-col bg-background text-foreground">
-        <div className="flex justify-end gap-2 border-b p-4">
+        <div className="fixed right-0 bottom-0 z-50 flex justify-end gap-2 p-4">
          <Button
-            onClick={() => setTheme("dark")}
+            onClick={() => setTheme(theme === "dark" ? "light" : "dark")}
            size="sm"
-            variant={theme === "dark" ? "default" : "outline"}
+            variant="outline"
            className="h-auto w-auto shrink-0 rounded-full p-2"
          >
-            <MoonIcon className="size-4" />
-          </Button>
-
-          <Button
-            onClick={() => setTheme("light")}
-            size="sm"
-            variant={theme === "light" ? "default" : "outline"}
-            className="h-auto w-auto shrink-0 rounded-full p-2"
-          >
-            <SunIcon className="size-4" />
+            {theme === "dark" ? (
+              <MoonIcon className="size-4" />
+            ) : (
+              <SunIcon className="size-4" />
+            )}
          </Button>
        </div>

@@ -49,12 +49,13 @@ module.exports = [
  "/templates/:template_slug",
  // -- learn --
  "/learn",
-  "/learn/tutorials",
-  "/learn/tutorials/:tutorial_slug",
  "/learn/guides",
  "/learn/guides/:guide_slug",
  "/learn/courses",
  "/learn/glossary",
+  "/learn/glossary/:glossary_slug",
  // -- faucets --
  "/faucets",
+  // -- brand kit --
+  "/brand-kit",
 ];
@@ -12,6 +12,7 @@
  "ignoreDependencies": [
    "@storybook/blocks",
    "@thirdweb-dev/service-utils",
-    "@types/color"
+    "@types/color",
+    "fast-xml-parser"
  ]
 }
@@ -1,7 +1,9 @@
 // @ts-check
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { XMLParser } = require("fast-xml-parser");

 /**
- *
+ * @returns {Promise<Array<{chainId: number, name: string, slug: string}>>}
 */
 async function fetchChainsFromApi() {
  const res = await fetch("https://api.thirdweb.com/v1/chains", {
@@ -82,16 +84,20 @@ module.exports = {
    };
  },
  additionalPaths: async (config) => {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const FRAMER_PATHS = require("./framer-rewrites");
-    const allChains = await fetchChainsFromApi();
+    const [framerUrls, allChains] = await Promise.all([
+      getFramerXML(),
+      fetchChainsFromApi(),
+    ]);
+
    return [
-      ...FRAMER_PATHS.map((path) => ({
-        loc: path,
-        changefreq: config.changefreq,
-        priority: config.priority,
-        lastmod: config.autoLastmod ? new Date().toISOString() : undefined,
-      })),
+      ...framerUrls.map((url) => {
+        return {
+          loc: url.loc,
+          changefreq: config.changefreq,
+          priority: config.priority,
+          lastmod: config.autoLastmod ? new Date().toISOString() : undefined,
+        };
+      }),
      ...allChains.map((chain) => {
        return {
          loc: `/${chain.slug}`,
@@ -136,3 +142,19 @@ async function createSearchRecordSitemaps(config) {
  // filter out any failed requests
  return chainsForLines.filter(Boolean);
 }
+
+async function getFramerXML() {
+  const framerSiteMapText = await fetch(
+    "https://landing.thirdweb.com/sitemap.xml",
+  ).then((res) => res.text());
+
+  const parser = new XMLParser();
+  const xmlObject = parser.parse(framerSiteMapText);
+
+  /**
+   * @type {Array<{loc: string}>}
+   */
+  const urls = xmlObject.urlset.url;
+
+  return urls;
+}
@@ -203,7 +203,6 @@ function getConfig(): NextConfig {
                  type: "memory",
                });
              }
-              config.externals.push("pino-pretty");
              config.module = {
                ...config.module,
                exprContextCritical: false,
@@ -29,29 +29,29 @@
    "@emotion/styled": "11.14.0",
    "@hookform/resolvers": "^3.9.1",
    "@marsidev/react-turnstile": "^1.1.0",
-    "@radix-ui/react-accordion": "^1.2.3",
-    "@radix-ui/react-alert-dialog": "^1.1.6",
-    "@radix-ui/react-avatar": "^1.1.3",
-    "@radix-ui/react-checkbox": "^1.1.4",
-    "@radix-ui/react-dialog": "1.1.6",
-    "@radix-ui/react-dropdown-menu": "^2.1.6",
-    "@radix-ui/react-hover-card": "^1.1.6",
-    "@radix-ui/react-label": "^2.1.2",
-    "@radix-ui/react-popover": "^1.1.6",
-    "@radix-ui/react-progress": "^1.1.2",
-    "@radix-ui/react-radio-group": "^1.2.3",
-    "@radix-ui/react-select": "^2.1.6",
-    "@radix-ui/react-separator": "^1.1.2",
-    "@radix-ui/react-slot": "^1.1.2",
-    "@radix-ui/react-switch": "^1.1.3",
-    "@radix-ui/react-tooltip": "1.1.8",
-    "@sentry/nextjs": "9.5.0",
-    "@shazow/whatsabi": "0.20.0",
-    "@tanstack/react-query": "5.67.3",
+    "@radix-ui/react-accordion": "^1.2.4",
+    "@radix-ui/react-alert-dialog": "^1.1.7",
+    "@radix-ui/react-avatar": "^1.1.4",
+    "@radix-ui/react-checkbox": "^1.1.5",
+    "@radix-ui/react-dialog": "1.1.7",
+    "@radix-ui/react-dropdown-menu": "^2.1.7",
+    "@radix-ui/react-hover-card": "^1.1.7",
+    "@radix-ui/react-label": "^2.1.3",
+    "@radix-ui/react-popover": "^1.1.7",
+    "@radix-ui/react-progress": "^1.1.3",
+    "@radix-ui/react-radio-group": "^1.2.4",
+    "@radix-ui/react-select": "^2.1.7",
+    "@radix-ui/react-separator": "^1.1.3",
+    "@radix-ui/react-slot": "^1.2.0",
+    "@radix-ui/react-switch": "^1.1.4",
+    "@radix-ui/react-tooltip": "1.2.0",
+    "@sentry/nextjs": "9.12.0",
+    "@shazow/whatsabi": "0.21.0",
+    "@tanstack/react-query": "5.72.1",
    "@tanstack/react-table": "^8.21.2",
    "@thirdweb-dev/service-utils": "workspace:*",
    "@vercel/functions": "2.0.0",
-    "@vercel/og": "^0.6.5",
+    "@vercel/og": "^0.6.8",
    "abitype": "1.0.8",
    "chakra-react-select": "^4.7.6",
    "class-variance-authority": "^0.7.1",
@@ -59,6 +59,7 @@
    "color": "5.0.0",
    "compare-versions": "^6.1.0",
    "date-fns": "4.1.0",
+    "fast-xml-parser": "^5.2.0",
    "fetch-event-stream": "0.1.5",
    "flat": "^6.0.1",
    "framer-motion": "12.5.0",
@@ -67,8 +68,8 @@
    "input-otp": "^1.4.1",
    "ioredis": "^5.6.0",
    "ipaddr.js": "^2.2.0",
-    "lucide-react": "0.483.0",
-    "next": "15.2.3",
+    "lucide-react": "0.487.0",
+    "next": "15.2.4",
    "next-plausible": "^3.12.4",
    "next-themes": "^0.4.6",
    "nextjs-toploader": "^1.6.12",
@@ -77,25 +78,26 @@
    "papaparse": "^5.5.2",
    "pluralize": "^8.0.0",
    "posthog-js": "1.67.1",
+    "prettier": "3.5.3",
    "qrcode": "^1.5.3",
-    "react": "19.0.0",
+    "react": "19.1.0",
    "react-children-utilities": "^2.10.0",
    "react-day-picker": "^8.10.1",
-    "react-dom": "19.0.0",
+    "react-dom": "19.1.0",
    "react-dropzone": "^14.3.8",
    "react-error-boundary": "^5.0.0",
-    "react-hook-form": "7.54.2",
+    "react-hook-form": "7.55.0",
    "react-markdown": "^9.0.1",
    "react-table": "^7.8.0",
-    "recharts": "2.15.1",
+    "recharts": "2.15.2",
    "remark-gfm": "4.0.1",
    "responsive-rsc": "0.0.7",
    "server-only": "^0.0.1",
    "shiki": "1.27.0",
-    "sonner": "2.0.1",
+    "sonner": "2.0.3",
    "spdx-correct": "^3.2.0",
    "stripe": "17.7.0",
-    "swagger-ui-react": "^5.20.1",
+    "swagger-ui-react": "^5.20.7",
    "tailwind-merge": "^2.6.0",
    "tailwindcss-animate": "^1.0.7",
    "thirdweb": "workspace:*",
@@ -106,41 +108,41 @@
  "devDependencies": {
    "@chakra-ui/cli": "^2.4.1",
    "@chromatic-com/storybook": "3.2.6",
-    "@next/bundle-analyzer": "15.2.3",
-    "@next/eslint-plugin-next": "15.2.3",
+    "@next/bundle-analyzer": "15.2.4",
+    "@next/eslint-plugin-next": "15.2.4",
    "@playwright/test": "1.51.1",
-    "@storybook/addon-essentials": "8.6.4",
-    "@storybook/addon-interactions": "8.6.4",
-    "@storybook/addon-links": "8.6.4",
-    "@storybook/addon-onboarding": "8.6.4",
-    "@storybook/addon-viewport": "8.6.4",
-    "@storybook/blocks": "8.6.4",
-    "@storybook/nextjs": "8.6.4",
-    "@storybook/react": "8.6.4",
-    "@storybook/test": "8.6.4",
+    "@storybook/addon-essentials": "8.6.12",
+    "@storybook/addon-interactions": "8.6.12",
+    "@storybook/addon-links": "8.6.12",
+    "@storybook/addon-onboarding": "8.6.12",
+    "@storybook/addon-viewport": "8.6.12",
+    "@storybook/blocks": "8.6.12",
+    "@storybook/nextjs": "8.6.12",
+    "@storybook/react": "8.6.12",
+    "@storybook/test": "8.6.12",
    "@types/color": "4.2.0",
-    "@types/node": "22.13.10",
+    "@types/node": "22.14.0",
    "@types/papaparse": "^5.3.15",
    "@types/pluralize": "^0.0.33",
    "@types/qrcode": "^1.5.5",
-    "@types/react": "19.0.10",
-    "@types/react-dom": "19.0.4",
+    "@types/react": "19.1.0",
+    "@types/react-dom": "19.1.1",
    "@types/react-table": "^7.7.20",
    "@types/spdx-correct": "^3.1.3",
    "@types/swagger-ui-react": "^4.19.0",
    "@typescript-eslint/eslint-plugin": "7.14.1",
    "@typescript-eslint/parser": "7.14.1",
    "autoprefixer": "^10.4.21",
-    "checkly": "5.0.1",
+    "checkly": "5.2.0",
    "eslint": "8.57.0",
    "eslint-config-biome": "1.9.4",
-    "eslint-plugin-react-compiler": "19.0.0-beta-40c6c23-20250301",
-    "eslint-plugin-storybook": "0.11.6",
-    "knip": "5.46.0",
+    "eslint-plugin-react-compiler": "19.0.0-beta-e993439-20250405",
+    "eslint-plugin-storybook": "0.12.0",
+    "knip": "5.47.0",
    "next-sitemap": "^4.2.3",
    "postcss": "8.5.3",
-    "storybook": "8.6.4",
+    "storybook": "8.6.12",
    "tailwindcss": "3.4.17",
-    "typescript": "5.8.2"
+    "typescript": "5.8.3"
  }
 }
@@ -361,6 +361,19 @@ async function redirects() {
        "/team/:team_slug/:project_slug/connect/universal-bridge/:path*",
      permanent: false,
    },
+
+    // all /learn/tutorials (and sub-routes) -> /learn/guides
+    {
+      source: "/learn/tutorials/:path*",
+      destination: "/learn/guides/:path*",
+      permanent: false,
+    },
+    {
+      source: "/learn/tutorials",
+      destination: "/learn/guides",
+      permanent: false,
+    },
+
    ...legacyDashboardToTeamRedirects,
  ];
 }
@@ -10,12 +10,9 @@ import {
  isMoralisSupported,
  transformMoralisResponseToNFT,
 } from "lib/wallet/nfts/moralis";
-import {
-  generateSimpleHashUrl,
-  isSimpleHashSupported,
-  transformSimpleHashResponseToNFT,
-} from "lib/wallet/nfts/simpleHash";
 import type { WalletNFT } from "lib/wallet/nfts/types";
+import { getVercelEnv } from "../../lib/vercel-utils";
+import { DASHBOARD_THIRDWEB_CLIENT_ID } from "../constants/env";

 type WalletNFTApiReturn =
  | { result: WalletNFT[]; error?: undefined }
@@ -24,40 +21,20 @@ type WalletNFTApiReturn =
 export async function getWalletNFTs(params: {
  chainId: number;
  owner: string;
+  isInsightSupported: boolean;
 }): Promise<WalletNFTApiReturn> {
  const { chainId, owner } = params;
-  const supportedChainSlug = await isSimpleHashSupported(chainId);

-  if (supportedChainSlug && process.env.SIMPLEHASH_API_KEY) {
-    const url = generateSimpleHashUrl({ chainSlug: supportedChainSlug, owner });
+  if (params.isInsightSupported) {
+    const response = await getWalletNFTsFromInsight({ chainId, owner });

-    const response = await fetch(url, {
-      method: "GET",
-      headers: {
-        "X-API-KEY": process.env.SIMPLEHASH_API_KEY,
-      },
-      next: {
-        revalidate: 10, // cache for 10 seconds
-      },
-    });
-
-    if (response.status >= 400) {
+    if (!response.ok) {
      return {
-        error: response.statusText,
+        error: response.error,
      };
    }

-    try {
-      const parsedResponse = await response.json();
-      const result = await transformSimpleHashResponseToNFT(
-        parsedResponse,
-        owner,
-      );
-
-      return { result };
-    } catch {
-      return { error: "error parsing response" };
-    }
+    return { result: response.data };
  }

  if (isAlchemySupported(chainId)) {
@@ -115,3 +92,115 @@ export async function getWalletNFTs(params: {

  return { error: "unsupported chain" };
 }
+
+type OwnedNFTInsightResponse = {
+  name: string;
+  description: string;
+  image_url: string;
+  background_color: string;
+  external_url: string;
+  metadata_url: string;
+  extra_metadata: {
+    customImage?: string;
+    customAnimationUrl?: string;
+    animation_original_url?: string;
+    image_original_url?: string;
+  };
+  collection: {
+    name: string;
+    description: string;
+    extra_metadata: Record<string, string>;
+  };
+  contract: {
+    chain_id: number;
+    address: string;
+    type: "erc1155" | "erc721";
+    name: string;
+  };
+  owner_addresses: string[];
+  token_id: string;
+  balance: string;
+  token_type: "erc1155" | "erc721";
+};
+
+async function getWalletNFTsFromInsight(params: {
+  chainId: number;
+  owner: string;
+}): Promise<
+  | {
+      data: WalletNFT[];
+      ok: true;
+    }
+  | {
+      ok: false;
+      error: string;
+    }
+> {
+  const { chainId, owner } = params;
+
+  const thirdwebDomain =
+    getVercelEnv() === "production" ? "thirdweb" : "thirdweb-dev";
+  const url = new URL(`https://insight.${thirdwebDomain}.com/v1/nfts`);
+  url.searchParams.append("chain", chainId.toString());
+  url.searchParams.append("limit", "10");
+  url.searchParams.append("owner_address", owner);
+
+  const response = await fetch(url, {
+    headers: {
+      "x-client-id": DASHBOARD_THIRDWEB_CLIENT_ID,
+    },
+  });
+
+  if (!response.ok) {
+    const errorMessage = await response.text();
+    return {
+      ok: false,
+      error: errorMessage,
+    };
+  }
+
+  const nftsResponse = (await response.json()) as {
+    data: OwnedNFTInsightResponse[];
+  };
+
+  const isDev = getVercelEnv() !== "production";
+
+  // NOTE: ipfscdn.io/ to thirdwebstorage-dev.com/ replacement is temporary
+  // This should be fixed in the insight dev endpoint
+
+  const walletNFTs = nftsResponse.data.map((nft) => {
+    const walletNFT: WalletNFT = {
+      id: nft.token_id,
+      contractAddress: nft.contract.address,
+      metadata: {
+        uri: isDev
+          ? nft.metadata_url.replace("ipfscdn.io/", "thirdwebstorage-dev.com/")
+          : nft.metadata_url,
+        name: nft.name,
+        description: nft.description,
+        image: isDev
+          ? nft.image_url.replace("ipfscdn.io/", "thirdwebstorage-dev.com/")
+          : nft.image_url,
+        animation_url: isDev
+          ? nft.extra_metadata.animation_original_url?.replace(
+              "ipfscdn.io/",
+              "thirdwebstorage-dev.com/",
+            )
+          : nft.extra_metadata.animation_original_url,
+        external_url: nft.external_url,
+        background_color: nft.background_color,
+      },
+      owner: params.owner,
+      tokenURI: nft.metadata_url,
+      type: nft.token_type === "erc721" ? "ERC721" : "ERC1155",
+      supply: nft.balance,
+    };
+
+    return walletNFT;
+  });
+
+  return {
+    data: walletNFTs,
+    ok: true,
+  };
+}
@@ -270,9 +270,10 @@ type ActiveStatus = {
  ecosystemWallet: boolean;
 };

-export async function isProjectActive(
-  params: AnalyticsQueryParams,
-): Promise<ActiveStatus> {
+export async function isProjectActive(params: {
+  teamId: string;
+  projectId: string;
+}): Promise<ActiveStatus> {
  const searchParams = buildSearchParams(params);
  const res = await fetchAnalytics(
    `v2/active-usage?${searchParams.toString()}`,
@@ -8,13 +8,12 @@ import { GradientAvatar } from "./GradientAvatar";
 const meta = {
  title: "blocks/Avatars/GradientAvatar",
  component: Story,
-  parameters: {},
 } satisfies Meta<typeof Story>;

 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

@@ -22,14 +21,14 @@ const client = getThirdwebClient();

 function Story() {
  return (
-    <div className="flex flex-col gap-10 p-10">
-      <p> All images below are set with size-6 className </p>
+    <div className="container flex max-w-6xl flex-col gap-10 py-10">
+      <p> All images below are set with size-20 className </p>

      <BadgeContainer label="No Src, No id - Skeleton">
        <GradientAvatar
          id={undefined}
          src={undefined}
-          className="size-6"
+          className="size-20"
          client={client}
        />
      </BadgeContainer>
@@ -38,7 +37,7 @@ function Story() {
        <GradientAvatar
          id={"foo"}
          src={undefined}
-          className="size-6"
+          className="size-20"
          client={client}
        />
      </BadgeContainer>
@@ -47,7 +46,7 @@ function Story() {
        <GradientAvatar
          id={"foo"}
          src={""}
-          className="size-6"
+          className="size-20"
          client={client}
        />
      </BadgeContainer>
@@ -56,7 +55,7 @@ function Story() {
        <GradientAvatar
          id={"bar"}
          src={""}
-          className="size-6"
+          className="size-20"
          client={client}
        />
      </BadgeContainer>
@@ -65,7 +64,7 @@ function Story() {
        <GradientAvatar
          src="invalid-src"
          id={undefined}
-          className="size-6"
+          className="size-20"
          client={client}
        />
      </BadgeContainer>
@@ -74,7 +73,7 @@ function Story() {
        <GradientAvatar
          src="https://picsum.photos/200/300"
          id={undefined}
-          className="size-6"
+          className="size-20"
          client={client}
        />
      </BadgeContainer>
@@ -83,7 +82,7 @@ function Story() {
        <GradientAvatar
          src="ipfs://QmZbeJYEs7kCJHyQxjxU2SJUtjSAr4m87wzJFJUyWomKdj/Smily.svg"
          id={undefined}
-          className="size-6"
+          className="size-20"
          client={client}
        />
      </BadgeContainer>
@@ -123,14 +122,14 @@ function ToggleTest() {
        <GradientAvatar
          src={data?.src}
          id={data?.id}
-          className="size-6"
+          className="size-20"
          client={client}
        />
      </BadgeContainer>

      <BadgeContainer label="invalid Src">
        <GradientAvatar
-          className="size-6"
+          className="size-20"
          src={data ? "invalid-src" : undefined}
          id={undefined}
          client={client}
@@ -14,7 +14,7 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

@@ -22,7 +22,7 @@ const client = getThirdwebClient();

 function Story() {
  return (
-    <div className="flex flex-col gap-10 p-10">
+    <div className="container flex max-w-6xl flex-col gap-10 py-10">
      <p> All images below are set with size-6 className </p>

      <BadgeContainer label="No Src - Skeleton">
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from "@storybook/react";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+import { BadgeContainer } from "../../../stories/utils";
 import { DangerSettingCard } from "./DangerSettingCard";

 const meta = {
@@ -15,17 +15,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Story() {
  return (
    <div className="container flex max-w-[1000px] flex-col gap-8 py-10">
@@ -9,13 +9,12 @@ import { Img } from "./Img";
 const meta = {
  title: "blocks/Img",
  component: Story,
-  parameters: {},
 } satisfies Meta<typeof Story>;

 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

@@ -19,30 +19,7 @@ export function MobileSidebar(props: {
  triggerClassName?: string;
 }) {
  const [isOpen, setIsOpen] = useState(false);
-  const pathname = usePathname();
-
-  const activeLink = useMemo(() => {
-    function isActive(link: SidebarBaseLink) {
-      if (link.exactMatch) {
-        return link.href === pathname;
-      }
-      return pathname?.startsWith(link.href);
-    }
-
-    for (const link of props.links) {
-      if ("group" in link) {
-        for (const subLink of link.links) {
-          if (isActive(subLink)) {
-            return subLink;
-          }
-        }
-      } else {
-        if (isActive(link)) {
-          return link;
-        }
-      }
-    }
-  }, [props.links, pathname]);
+  const activeLink = useActiveSidebarLink(props.links);

  const defaultTrigger = (
    <Button
@@ -75,3 +52,32 @@ export function MobileSidebar(props: {
    </Dialog>
  );
 }
+
+export function useActiveSidebarLink(links: SidebarLink[]) {
+  const pathname = usePathname();
+
+  const activeLink = useMemo(() => {
+    function isActive(link: SidebarBaseLink) {
+      if (link.exactMatch) {
+        return link.href === pathname;
+      }
+      return pathname?.startsWith(link.href);
+    }
+
+    for (const link of links) {
+      if ("group" 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;
+}
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import { useState } from "react";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+import { BadgeContainer } from "../../../stories/utils";
 import { MultiNetworkSelector } from "./NetworkSelectors";

 const meta = {
@@ -16,20 +16,13 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Story() {
  return (
-    <div className="container flex max-w-[1000px] flex-col gap-8 lg:p-10">
+    <div className="container flex max-w-6xl flex-col gap-8 py-10">
      <Variant label="No Chains selected by default" selectedChainIds={[]} />
      <Variant
        label="Polygon, Ethereum selected by default"
@@ -18,17 +18,39 @@ export function MultiNetworkSelector(props: {
  onChange: (chainIds: number[]) => void;
  disableChainId?: boolean;
  className?: string;
+  priorityChains?: number[];
 }) {
  const { allChains, idToChain } = useAllChainsData();

  const options = useMemo(() => {
-    return allChains.map((chain) => {
+    let sortedChains = allChains;
+
+    if (props.priorityChains) {
+      const priorityChainsSet = new Set();
+      for (const chainId of props.priorityChains || []) {
+        priorityChainsSet.add(chainId);
+      }
+
+      const priorityChains = (props.priorityChains || [])
+        .map((chainId) => {
+          return idToChain.get(chainId);
+        })
+        .filter((v) => !!v);
+
+      const otherChains = allChains.filter(
+        (chain) => !priorityChainsSet.has(chain.chainId),
+      );
+
+      sortedChains = [...priorityChains, ...otherChains];
+    }
+
+    return sortedChains.map((chain) => {
      return {
        label: cleanChainName(chain.name),
        value: String(chain.chainId),
      };
    });
-  }, [allChains]);
+  }, [allChains, props.priorityChains, idToChain]);

  const searchFn = useCallback(
    (option: Option, searchValue: string) => {
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from "@storybook/react";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+import { BadgeContainer } from "../../../stories/utils";
 import { SettingsCard } from "./SettingsCard";

 const meta = {
@@ -15,139 +15,130 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Story() {
  return (
-    <div className="min-h-dvh bg-background py-6 text-foreground">
-      <div className="container flex max-w-[1100px] flex-col gap-10 lg:p-10">
-        <BadgeContainer label="No Header">
-          <SettingsCard
-            bottomText="This is bottom text"
-            header={undefined}
-            errorText={undefined}
-            noPermissionText={undefined}
-            saveButton={undefined}
-          >
-            <ChildrenPlaceholder />
-          </SettingsCard>
-        </BadgeContainer>
+    <div className="container flex max-w-6xl flex-col gap-10 py-10">
+      <BadgeContainer label="No Header">
+        <SettingsCard
+          bottomText="This is bottom text"
+          header={undefined}
+          errorText={undefined}
+          noPermissionText={undefined}
+          saveButton={undefined}
+        >
+          <ChildrenPlaceholder />
+        </SettingsCard>
+      </BadgeContainer>

-        <BadgeContainer label="Header">
-          <SettingsCard
-            bottomText="This is bottom text"
-            header={{
-              title: "Some Title",
-              description: "This is some description for this card",
-            }}
-            errorText={undefined}
-            noPermissionText={undefined}
-            saveButton={undefined}
-          >
-            <ChildrenPlaceholder />
-          </SettingsCard>
-        </BadgeContainer>
+      <BadgeContainer label="Header">
+        <SettingsCard
+          bottomText="This is bottom text"
+          header={{
+            title: "Some Title",
+            description: "This is some description for this card",
+          }}
+          errorText={undefined}
+          noPermissionText={undefined}
+          saveButton={undefined}
+        >
+          <ChildrenPlaceholder />
+        </SettingsCard>
+      </BadgeContainer>

-        <BadgeContainer label="Error">
-          <SettingsCard
-            bottomText="This is bottom text"
-            header={{
-              title: "Some Title",
-              description: "This is some description for this card",
-            }}
-            errorText="This is error text"
-            noPermissionText={undefined}
-            saveButton={undefined}
-          >
-            <ChildrenPlaceholder />
-          </SettingsCard>
-        </BadgeContainer>
+      <BadgeContainer label="Error">
+        <SettingsCard
+          bottomText="This is bottom text"
+          header={{
+            title: "Some Title",
+            description: "This is some description for this card",
+          }}
+          errorText="This is error text"
+          noPermissionText={undefined}
+          saveButton={undefined}
+        >
+          <ChildrenPlaceholder />
+        </SettingsCard>
+      </BadgeContainer>

-        <BadgeContainer label="No Permission">
-          <SettingsCard
-            bottomText="This is bottom text"
-            header={{
-              title: "Some Title",
-              description: "This is some description for this card",
-            }}
-            saveButton={{
-              disabled: false,
-              isPending: false,
-              onClick: () => {},
-            }}
-            noPermissionText="You do not have permission to edit this"
-            errorText={undefined}
-          >
-            <ChildrenPlaceholder />
-          </SettingsCard>
-        </BadgeContainer>
+      <BadgeContainer label="No Permission">
+        <SettingsCard
+          bottomText="This is bottom text"
+          header={{
+            title: "Some Title",
+            description: "This is some description for this card",
+          }}
+          saveButton={{
+            disabled: false,
+            isPending: false,
+            onClick: () => {},
+          }}
+          noPermissionText="You do not have permission to edit this"
+          errorText={undefined}
+        >
+          <ChildrenPlaceholder />
+        </SettingsCard>
+      </BadgeContainer>

-        <BadgeContainer label="Save">
-          <SettingsCard
-            bottomText="This is bottom text"
-            header={{
-              title: "Some Title",
-              description: "This is some description for this card",
-            }}
-            saveButton={{
-              disabled: false,
-              isPending: false,
-              onClick: () => {},
-            }}
-            noPermissionText={undefined}
-            errorText={undefined}
-          >
-            <ChildrenPlaceholder />
-          </SettingsCard>
-        </BadgeContainer>
+      <BadgeContainer label="Save">
+        <SettingsCard
+          bottomText="This is bottom text"
+          header={{
+            title: "Some Title",
+            description: "This is some description for this card",
+          }}
+          saveButton={{
+            disabled: false,
+            isPending: false,
+            onClick: () => {},
+          }}
+          noPermissionText={undefined}
+          errorText={undefined}
+        >
+          <ChildrenPlaceholder />
+        </SettingsCard>
+      </BadgeContainer>

-        <BadgeContainer label="Save Disabled">
-          <SettingsCard
-            bottomText="This is bottom text"
-            header={{
-              title: "Some Title",
-              description: "This is some description for this card",
-            }}
-            saveButton={{
-              disabled: true,
-              isPending: false,
-              onClick: () => {},
-            }}
-            noPermissionText={undefined}
-            errorText={undefined}
-          >
-            <ChildrenPlaceholder />
-          </SettingsCard>
-        </BadgeContainer>
+      <BadgeContainer label="Save Disabled">
+        <SettingsCard
+          bottomText="This is bottom text"
+          header={{
+            title: "Some Title",
+            description: "This is some description for this card",
+          }}
+          saveButton={{
+            disabled: true,
+            isPending: false,
+            onClick: () => {},
+          }}
+          noPermissionText={undefined}
+          errorText={undefined}
+        >
+          <ChildrenPlaceholder />
+        </SettingsCard>
+      </BadgeContainer>

-        <BadgeContainer label="Save Loading">
-          <SettingsCard
-            bottomText="This is bottom text"
-            header={{
-              title: "Some Title",
-              description: "This is some description for this card",
-            }}
-            saveButton={{
-              disabled: false,
-              isPending: true,
-              onClick: () => {},
-            }}
-            noPermissionText={undefined}
-            errorText={undefined}
-          >
-            <ChildrenPlaceholder />
-          </SettingsCard>
-        </BadgeContainer>
-      </div>
+      <BadgeContainer label="Save Loading">
+        <SettingsCard
+          bottomText="This is bottom text"
+          header={{
+            title: "Some Title",
+            description: "This is some description for this card",
+          }}
+          saveButton={{
+            disabled: false,
+            isPending: true,
+            onClick: () => {},
+          }}
+          noPermissionText={undefined}
+          errorText={undefined}
+        >
+          <ChildrenPlaceholder />
+        </SettingsCard>
+      </BadgeContainer>
    </div>
  );
 }
@@ -2,11 +2,13 @@ import { ExternalLinkIcon } from "lucide-react";
 import type React from "react";
 import { cn } from "../../lib/utils";
 import { NavLink } from "../ui/NavLink";
+import { Separator } from "../ui/separator";

 export type SidebarBaseLink = {
  href: string;
  label: React.ReactNode;
  exactMatch?: boolean;
+  icon?: React.FC<{ className?: string }>;
  tracking?: {
    category: string;
    action: string;
@@ -19,6 +21,9 @@ export type SidebarLink =
  | {
      group: string;
      links: SidebarBaseLink[];
+    }
+  | {
+      separator: true;
    };

 type SidebarContentProps = {
@@ -27,21 +32,18 @@ type SidebarContentProps = {
  className?: string;
 };

-export function Sidebar(props: SidebarContentProps) {
+export function CustomSidebar(props: SidebarContentProps) {
  return (
-    <aside
-      className={cn(
-        "sticky top-0 hidden w-[230px] flex-shrink-0 self-start lg:block",
-        props.className,
-      )}
-    >
-      <div className="py-7">
-        {props.header}
-        <div className="flex flex-col gap-1">
-          <RenderSidebarLinks links={props.links} />
+    <div className={cn("hidden w-[230px] shrink-0 lg:block", props.className)}>
+      <aside className="sticky top-0 self-start">
+        <div className="py-7">
+          {props.header}
+          <div className="flex flex-col gap-1">
+            <RenderSidebarLinks links={props.links} />
+          </div>
        </div>
-      </div>
-    </aside>
+      </aside>
+    </div>
  );
 }

@@ -61,6 +63,10 @@ export function RenderSidebarLinks(props: { links: SidebarLink[] }) {
          );
        }

+        if ("separator" in link) {
+          return <Separator className="my-2" />;
+        }
+
        const isExternal = link.href.startsWith("http");
        return (
          <NavLink
@@ -68,9 +74,10 @@ export function RenderSidebarLinks(props: { links: SidebarLink[] }) {
            key={i}
            href={link.href}
            className="flex items-center gap-2 rounded-md px-3 py-2 text-muted-foreground text-sm hover:bg-accent"
-            activeClassName="text-foreground"
+            activeClassName="text-foreground bg-accent"
            exactMatch={link.exactMatch}
          >
+            {link.icon && <link.icon className="size-4" />}
            {link.label}
            {isExternal && <ExternalLinkIcon className="size-3" />}
          </NavLink>
@@ -1,5 +1,4 @@
 import type { Meta, StoryObj } from "@storybook/react";
-import { mobileViewport } from "../../../stories/utils";
 import { SidebarLayout } from "./SidebarLayout";

 const meta = {
@@ -15,17 +14,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Story() {
  return (
    <SidebarLayout
@@ -1,6 +1,23 @@
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupContent,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarRail,
+  SidebarSeparator,
+  SidebarTrigger,
+  useSidebar,
+} from "@/components/ui/sidebar";
 import { cn } from "../../lib/utils";
-import { MobileSidebar } from "./MobileSidebar";
-import { Sidebar, type SidebarLink } from "./Sidebar";
+import { NavLink } from "../ui/NavLink";
+import { Separator } from "../ui/separator";
+import { MobileSidebar, useActiveSidebarLink } from "./MobileSidebar";
+import { CustomSidebar, type SidebarLink } from "./Sidebar";
+import { AppFooter } from "./app-footer";

 export function SidebarLayout(props: {
  sidebarLinks: SidebarLink[];
@@ -17,7 +34,10 @@ export function SidebarLayout(props: {
        props.className,
      )}
    >
-      <Sidebar links={sidebarLinks} className={props.desktopSidebarClassName} />
+      <CustomSidebar
+        links={sidebarLinks}
+        className={props.desktopSidebarClassName}
+      />
      <MobileSidebar
        links={sidebarLinks}
        triggerClassName={props.mobileSidebarClassName}
@@ -29,3 +49,117 @@ 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 collapsible="icon" side="left" className="pt-2">
+        <SidebarContent>
+          <SidebarGroup>
+            <SidebarGroupContent>
+              <RenderSidebarGroup
+                sidebarLinks={contentSidebarLinks}
+                groupName={undefined}
+              />
+            </SidebarGroupContent>
+          </SidebarGroup>
+        </SidebarContent>
+
+        {footerSidebarLinks && (
+          <SidebarFooter className="pb-3">
+            <RenderSidebarGroup
+              sidebarLinks={footerSidebarLinks}
+              groupName={undefined}
+            />
+          </SidebarFooter>
+        )}
+
+        <SidebarRail />
+      </Sidebar>
+
+      {/* right - content */}
+      <div className="flex h-full flex-grow flex-col overflow-y-auto">
+        <MobileSidebarTrigger
+          links={[...contentSidebarLinks, ...(footerSidebarLinks || [])]}
+        />
+
+        <main className="z-0 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 | undefined;
+}) {
+  const { sidebarLinks } = props;
+  const sidebar = useSidebar();
+
+  return (
+    <SidebarMenu className="gap-1.5">
+      {sidebarLinks.map((link) => {
+        if ("href" in link) {
+          return (
+            <SidebarMenuItem key={link.href}>
+              <SidebarMenuButton asChild>
+                <NavLink
+                  href={link.href}
+                  className="flex items-center gap-2 text-muted-foreground text-sm hover:bg-accent"
+                  activeClassName="text-foreground bg-accent"
+                  exactMatch={link.exactMatch}
+                  tracking={link.tracking}
+                  onClick={() => {
+                    sidebar.setOpenMobile(false);
+                  }}
+                >
+                  {link.icon && <link.icon className="size-4" />}
+                  <span>{link.label}</span>
+                </NavLink>
+              </SidebarMenuButton>
+            </SidebarMenuItem>
+          );
+        }
+
+        if ("separator" in link) {
+          return <SidebarSeparator className="my-1" />;
+        }
+
+        return (
+          <RenderSidebarGroup
+            sidebarLinks={link.links}
+            groupName={link.group}
+            key={link.group}
+          />
+        );
+      })}
+    </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 orientation="vertical" className="h-4" />
+      {activeLink && <span className="text-sm">{activeLink.label}</span>}
+    </div>
+  );
+}
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import { useState } from "react";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+import { BadgeContainer } from "../../../stories/utils";
 import { SingleNetworkSelector } from "./NetworkSelectors";

 const meta = {
@@ -16,20 +16,13 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Story() {
  return (
-    <div className="container flex max-w-[1000px] flex-col gap-8 lg:p-10">
+    <div className="container flex max-w-6xl flex-col gap-8 py-10">
      <Variant label="No Chain ID selected by default" chainId={undefined} />
      <Variant label="Polygon selected by default" chainId={137} />
      <Variant
@@ -12,17 +12,23 @@ import Link from "next/link";

 type AppFooterProps = {
  className?: string;
+  containerClassName?: string;
 };

 export function AppFooter(props: AppFooterProps) {
  return (
    <footer
      className={cn(
-        "w-full border-border border-t bg-card py-6 md:py-8",
+        "w-full border-border border-t py-6 md:py-8",
        props.className,
      )}
    >
-      <div className="container flex flex-col gap-4 md:gap-6">
+      <div
+        className={cn(
+          "container flex flex-col gap-4 md:gap-6",
+          props.containerClassName,
+        )}
+      >
        {/* top row */}
        <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
          <div className="flex flex-row items-center gap-3">
@@ -30,6 +30,7 @@ type ThirdwebAreaChartProps<TConfig extends ChartConfig> = {
    description?: string;
    titleClassName?: string;
  };
+  customHeader?: React.ReactNode;
  // chart config
  config: TConfig;
  data: Array<Record<keyof TConfig, number> & { time: number | string | Date }>;
@@ -60,6 +61,8 @@ export function ThirdwebAreaChart<TConfig extends ChartConfig>(
        </CardHeader>
      )}

+      {props.customHeader && props.customHeader}
+
      <CardContent className={cn(!props.header && "pt-6")}>
        <ChartContainer config={props.config} className={props.chartClassName}>
          {props.isPending ? (
@@ -32,6 +32,7 @@ type ThirdwebBarChartProps<TConfig extends ChartConfig> = {
    description?: string;
    titleClassName?: string;
  };
+  customHeader?: React.ReactNode;
  // chart config
  config: TConfig;
  data: Array<Record<keyof TConfig, number> & { time: number | string | Date }>;
@@ -41,7 +42,9 @@ type ThirdwebBarChartProps<TConfig extends ChartConfig> = {
  chartClassName?: string;
  isPending: boolean;
  toolTipLabelFormatter?: (label: string, payload: unknown) => React.ReactNode;
+  toolTipValueFormatter?: (value: unknown) => React.ReactNode;
  hideLabel?: boolean;
+  emptyChartState?: React.ReactElement;
 };

 export function ThirdwebBarChart<TConfig extends ChartConfig>(
@@ -65,12 +68,14 @@ export function ThirdwebBarChart<TConfig extends ChartConfig>(
        </CardHeader>
      )}

+      {props.customHeader && props.customHeader}
+
      <CardContent className={cn(!props.header && "pt-6")}>
        <ChartContainer config={props.config} className={props.chartClassName}>
          {props.isPending ? (
            <LoadingChartState />
          ) : props.data.length === 0 ? (
-            <EmptyChartState />
+            <EmptyChartState>{props.emptyChartState}</EmptyChartState>
          ) : (
            <BarChart accessibilityLayer data={props.data}>
              <CartesianGrid vertical={false} />
@@ -88,6 +93,7 @@ export function ThirdwebBarChart<TConfig extends ChartConfig>(
                      props.hideLabel !== undefined ? props.hideLabel : true
                    }
                    labelFormatter={props.toolTipLabelFormatter}
+                    valueFormatter={props.toolTipValueFormatter}
                  />
                }
              />
@@ -96,25 +102,15 @@ export function ThirdwebBarChart<TConfig extends ChartConfig>(
                  content={<ChartLegendContent className="pt-5" />}
                />
              )}
-              {configKeys.map((key, idx) => (
+              {configKeys.map((key) => (
                <Bar
                  key={key}
                  dataKey={key}
                  // if stacked then they should all be the same stackId
                  // if grouped then they should all be unique stackId (so the key works great)
                  stackId={variant === "stacked" ? "a" : key}
-                  fill={`var(--color-${key})`}
-                  // if stacked then we need to figure out the radius based on the index in the array
-                  // if grouped then we can just use the same radius for all
-                  radius={
-                    variant === "stacked"
-                      ? idx === 0
-                        ? [0, 0, 4, 4]
-                        : idx === configKeys.length - 1
-                          ? [4, 4, 0, 0]
-                          : [0, 0, 0, 0]
-                      : [4, 4, 4, 4]
-                  }
+                  fill={props.config[key]?.color}
+                  radius={[4, 4, 4, 4]}
                  strokeWidth={1}
                  className="stroke-background"
                />
@@ -8,7 +8,7 @@ import {
 } from "@/components/ui/select";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useState } from "react";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+import { BadgeContainer } from "../../../stories/utils";
 import { type CodeEnvironment, CodeSegment } from "./code-segment.client";

 const meta = {
@@ -24,17 +24,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 type Mode = "default" | "no-tabs" | "only-tabs";

 function Story() {
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMemo, useState } from "react";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+import { BadgeContainer } from "../../../stories/utils";
 import { MultiSelect } from "./multi-select";

 const meta = {
@@ -16,17 +16,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function createList(len: number) {
  return Array.from({ length: len }, (_, i) => ({
    value: `${i}`,
@@ -36,7 +29,7 @@ function createList(len: number) {

 function Story() {
  return (
-    <div className="mx-auto flex w-full max-w-[600px] flex-col gap-6 px-4 py-6">
+    <div className="container flex max-w-6xl flex-col gap-6 py-10">
      <VariantTest defaultValues={[]} storyLabel="5 items" listLen={5} />
      <VariantTest defaultValues={[]} storyLabel="5000 items" listLen={5000} />
      <VariantTest
@@ -3,33 +3,35 @@ import type { Team } from "@/api/team";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { ToolTipLabel } from "@/components/ui/tooltip";
-import { TrackedLinkTW } from "@/components/ui/tracked-link";
 import { cn } from "@/lib/utils";
-import { CheckIcon, CircleAlertIcon, CircleDollarSignIcon } from "lucide-react";
+import { CheckIcon, CircleDollarSignIcon } from "lucide-react";
+import Link from "next/link";
 import type React from "react";
 import { TEAM_PLANS } from "utils/pricing";
+import { useTrack } from "../../../hooks/analytics/useTrack";
 import { remainingDays } from "../../../utils/date-utils";
 import type { GetBillingCheckoutUrlAction } from "../../actions/billing";
+import type { ProductSKU } from "../../lib/billing";
 import { CheckoutButton } from "../billing";

-type ButtonProps = React.ComponentProps<typeof Button>;
-
-const PRO_CONTACT_US_URL =
-  "https://meetings.hubspot.com/sales-thirdweb/thirdweb-pro";
+type PricingCardCta = {
+  hint?: string;
+  title: string;
+  onClick?: () => void;
+} & (
+  | {
+      type: "link";
+      href: string;
+    }
+  | {
+      type: "checkout";
+    }
+);

 type PricingCardProps = {
  teamSlug: string;
-  billingPlan: Exclude<Team["billingPlan"], "free">;
-  cta?: {
-    hint?: string;
-    title: string;
-    tracking: {
-      category: string;
-      label?: string;
-    };
-    variant?: ButtonProps["variant"];
-    onClick?: () => void;
-  };
+  billingPlan: keyof typeof TEAM_PLANS;
+  cta?: PricingCardCta;
  ctaHint?: string;
  highlighted?: boolean;
  current?: boolean;
@@ -49,13 +51,23 @@ export const PricingCard: React.FC<PricingCardProps> = ({
  const plan = TEAM_PLANS[billingPlan];
  const isCustomPrice = typeof plan.price === "string";

+  const trackEvent = useTrack();
  const remainingTrialDays =
    (activeTrialEndsAt ? remainingDays(activeTrialEndsAt) : 0) || 0;

+  const handleCTAClick = () => {
+    cta?.onClick?.();
+    trackEvent({
+      category: "account",
+      label: `${billingPlan}Plan`,
+      action: "click",
+    });
+  };
+
  return (
    <div
      className={cn(
-        "z-10 flex w-full flex-col gap-6 rounded-xl border border-border bg-card p-4 md:p-6",
+        "z-10 flex w-full flex-col gap-4 rounded-xl border border-border bg-card p-4",
        current && "border-blue-500",
        highlighted && "border-active-border",
      )}
@@ -71,13 +83,13 @@ export const PricingCard: React.FC<PricingCardProps> = ({
      <div className="flex flex-col gap-5">
        {/* Title + Desc */}
        <div>
-          <div className="mb-2 flex flex-row items-center gap-2">
+          <div className="mb-1 flex flex-row items-center gap-3">
            <h3 className="font-semibold text-2xl capitalize tracking-tight">
              {plan.title}
            </h3>
            {current && <Badge className="capitalize">Current plan</Badge>}
          </div>
-          <p className="max-w-[320px] text-muted-foreground">
+          <p className="max-w-[320px] text-muted-foreground text-sm">
            {plan.description}
          </p>
        </div>
@@ -85,30 +97,13 @@ export const PricingCard: React.FC<PricingCardProps> = ({
        {/* Price */}
        <div className="flex flex-col gap-0.5">
          <div className="flex items-center gap-2">
-            <span className="font-semibold text-3xl text-foreground tracking-tight">
+            <span className="font-semibold text-2xl text-foreground tracking-tight">
              ${plan.price}
            </span>

            {!isCustomPrice && (
              <span className="text-muted-foreground">/ month</span>
            )}
-
-            {billingPlan === "starter" && (
-              <ToolTipLabel
-                contentClassName="max-w-[320px]"
-                label="We will place a temporary hold of $25 to verify your card, this will be immediately released back to you after verification."
-              >
-                <Button
-                  asChild
-                  variant="ghost"
-                  className="h-auto w-auto p-1 text-muted-foreground hover:text-foreground"
-                >
-                  <div>
-                    <CircleAlertIcon className="size-5 shrink-0" />
-                  </div>
-                </Button>
-              </ToolTipLabel>
-            )}
          </div>

          {remainingTrialDays > 0 && (
@@ -124,7 +119,7 @@ export const PricingCard: React.FC<PricingCardProps> = ({

      <div className="flex grow flex-col items-start gap-2 text-foreground">
        {plan.subTitle && (
-          <p className="font-medium text-foreground">{plan.subTitle}</p>
+          <p className="font-medium text-foreground text-sm">{plan.subTitle}</p>
        )}

        {plan.features.map((f) => (
@@ -134,29 +129,30 @@ export const PricingCard: React.FC<PricingCardProps> = ({

      {cta && (
        <div className="flex flex-col gap-3">
-          {billingPlan !== "pro" ? (
+          {billingPlanToSkuMap[billingPlan] && cta.type === "checkout" && (
            <CheckoutButton
              buttonProps={{
-                variant: cta.variant || "outline",
-                className: "gap-2",
-                onClick: cta.onClick,
+                variant: highlighted ? "default" : "outline",
+                className: highlighted ? undefined : "bg-background",
+                onClick: handleCTAClick,
              }}
              teamSlug={teamSlug}
-              sku={billingPlan === "starter" ? "plan:starter" : "plan:growth"}
+              sku={billingPlanToSkuMap[billingPlan]}
              getBillingCheckoutUrl={getBillingCheckoutUrl}
            >
              {cta.title}
            </CheckoutButton>
-          ) : (
-            <Button variant={cta.variant || "outline"} asChild>
-              <TrackedLinkTW
-                href={PRO_CONTACT_US_URL}
-                label={cta.tracking?.label}
-                category={cta.tracking?.category}
-                target="_blank"
-              >
+          )}
+
+          {cta.type === "link" && (
+            <Button
+              variant={highlighted ? "default" : "outline"}
+              className={highlighted ? undefined : "bg-background"}
+              asChild
+            >
+              <Link href={cta.href} target="_blank" onClick={handleCTAClick}>
                {cta.title}
-              </TrackedLinkTW>
+              </Link>
            </Button>
          )}

@@ -171,6 +167,19 @@ export const PricingCard: React.FC<PricingCardProps> = ({
  );
 };

+const billingPlanToSkuMap: Record<Team["billingPlan"], ProductSKU | undefined> =
+  {
+    starter: "plan:starter",
+    growth: "plan:growth",
+    accelerate: "plan:accelerate",
+    scale: "plan:scale",
+    // we can't render checkout buttons for these plans:
+    pro: undefined,
+    free: undefined,
+    growth_legacy: undefined,
+    starter_legacy: undefined,
+  };
+
 type FeatureItemProps = {
  text: string | string[];
 };
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMemo, useState } from "react";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+import { BadgeContainer } from "../../../stories/utils";
 import { SelectWithSearch } from "./select-with-search";

 const meta = {
@@ -16,17 +16,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function createList(len: number) {
  return Array.from({ length: len }, (_, i) => ({
    value: `${i}`,
@@ -36,7 +29,7 @@ function createList(len: number) {

 function Story() {
  return (
-    <div className="mx-auto flex w-full max-w-[600px] flex-col gap-6 px-4 py-6">
+    <div className="container flex max-w-6xl flex-col gap-6 py-10">
      <VariantTest storyLabel="5 items" listLen={5} />
      <VariantTest storyLabel="5000 items" listLen={5000} />
      <VariantTest
@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from "@storybook/react";
 import { useState } from "react";
-import { BadgeContainer, mobileViewport } from "../../stories/utils";
+import { BadgeContainer } from "../../stories/utils";
 import { PaginationButtons } from "./pagination-buttons";

 const meta = {
@@ -16,17 +16,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Story() {
  return (
    <div className="container flex max-w-[1000px] flex-col gap-8 py-10">
@@ -15,6 +15,7 @@ export type NavButtonProps = {
    action: string;
    label: string;
  };
+  onClick?: () => void;
 };

 export function NavLink(props: React.PropsWithChildren<NavButtonProps>) {
@@ -30,7 +31,9 @@ export function NavLink(props: React.PropsWithChildren<NavButtonProps>) {
      href={props.href}
      className={cn(props.className, isActive && props.activeClassName)}
      target={props.href.startsWith("http") ? "_blank" : undefined}
+      prefetch={false}
      onClick={() => {
+        props.onClick?.();
        if (props.tracking) {
          track({
            category: props.tracking.category,
@@ -96,7 +96,10 @@ const BreadcrumbEllipsis = ({
  <span
    role="presentation"
    aria-hidden="true"
-    className={cn("flex h-9 w-9 items-center justify-center", className)}
+    className={cn(
+      "relative flex h-9 w-9 items-center justify-center",
+      className,
+    )}
    {...props}
  >
    <MoreHorizontal className="h-4 w-4" />
@@ -6,9 +6,6 @@ import { BadgeContainer } from "../../../stories/utils";
 const meta = {
  title: "Shadcn/Buttons",
  component: Component,
-  parameters: {
-    layout: "centered",
-  },
 } satisfies Meta<typeof Component>;

 export default meta;
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from "@storybook/react";
-import { BadgeContainer, mobileViewport } from "stories/utils";
+import { BadgeContainer } from "stories/utils";
 import { CodeClient } from "./code.client";

 const meta = {
@@ -11,17 +11,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 const tsCode = `\
 type User = {
  name: string;
@@ -86,7 +79,7 @@ const bashCode = "pnpm i thirdweb";

 function Component() {
  return (
-    <div className="container flex max-w-[600px] flex-col gap-10 py-10">
+    <div className="container flex max-w-6xl flex-col gap-10 py-10">
      <BadgeContainer label="ts">
        <CodeClient code={tsCode} lang="ts" />
      </BadgeContainer>
@@ -1,5 +1,5 @@
 import type { Meta, StoryObj } from "@storybook/react";
-import { BadgeContainer, mobileViewport } from "stories/utils";
+import { BadgeContainer } from "stories/utils";
 import { PlainTextCodeBlock } from "./plaintext-code";

 const meta = {
@@ -11,17 +11,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 const jsCode = `\
 import { getContract } from "thirdweb";
 import { sepolia } from "thirdweb/chains";
@@ -39,7 +32,7 @@ const overflowText =

 function Component() {
  return (
-    <div className="container flex max-w-[600px] flex-col gap-10 py-10">
+    <div className="container flex max-w-6xl flex-col gap-10 py-10">
      <BadgeContainer label="large chunk of code">
        <PlainTextCodeBlock code={jsCode} />
      </BadgeContainer>
@@ -94,7 +94,10 @@ const PaginationEllipsis = ({
 }: React.ComponentProps<"span">) => (
  <span
    aria-hidden
-    className={cn("flex h-9 w-9 items-center justify-center", className)}
+    className={cn(
+      "relative flex h-9 w-9 items-center justify-center",
+      className,
+    )}
    {...props}
  >
    <MoreHorizontal className="h-4 w-4" />
@@ -13,9 +13,6 @@ import { BadgeContainer } from "../../../stories/utils";
 const meta = {
  title: "Shadcn/Select",
  component: Component,
-  parameters: {
-    layout: "centered",
-  },
 } satisfies Meta<typeof Component>;

 export default meta;
@@ -0,0 +1,773 @@
+"use client";
+
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Separator } from "@/components/ui/separator";
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+} from "@/components/ui/sheet";
+import { Skeleton } from "@/components/ui/skeleton";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { useIsMobile } from "@/hooks/use-mobile";
+import { cn } from "@/lib/utils";
+import { Slot } from "@radix-ui/react-slot";
+import { type VariantProps, cva } from "class-variance-authority";
+import { PanelLeft } from "lucide-react";
+import * as React from "react";
+
+const SIDEBAR_COOKIE_NAME = "sidebar_state";
+const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
+const SIDEBAR_WIDTH = "16rem";
+const SIDEBAR_WIDTH_MOBILE = "18rem";
+const SIDEBAR_WIDTH_ICON = "3rem";
+const SIDEBAR_KEYBOARD_SHORTCUT = "b";
+
+type SidebarContextProps = {
+  state: "expanded" | "collapsed";
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  openMobile: boolean;
+  setOpenMobile: (open: boolean) => void;
+  isMobile: boolean;
+  toggleSidebar: () => void;
+};
+
+const SidebarContext = React.createContext<SidebarContextProps | null>(null);
+
+function useSidebar() {
+  const context = React.useContext(SidebarContext);
+  if (!context) {
+    throw new Error("useSidebar must be used within a SidebarProvider.");
+  }
+
+  return context;
+}
+
+const SidebarProvider = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> & {
+    defaultOpen?: boolean;
+    open?: boolean;
+    onOpenChange?: (open: boolean) => void;
+  }
+>(
+  (
+    {
+      defaultOpen = true,
+      open: openProp,
+      onOpenChange: setOpenProp,
+      className,
+      style,
+      children,
+      ...props
+    },
+    ref,
+  ) => {
+    const isMobile = useIsMobile();
+    const [openMobile, setOpenMobile] = React.useState(false);
+
+    // This is the internal state of the sidebar.
+    // We use openProp and setOpenProp for control from outside the component.
+    const [_open, _setOpen] = React.useState(defaultOpen);
+    const open = openProp ?? _open;
+    const setOpen = React.useCallback(
+      (value: boolean | ((value: boolean) => boolean)) => {
+        const openState = typeof value === "function" ? value(open) : value;
+        if (setOpenProp) {
+          setOpenProp(openState);
+        } else {
+          _setOpen(openState);
+        }
+
+        // This sets the cookie to keep the sidebar state.
+        // eslint-disable-next-line react-compiler/react-compiler
+        document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`;
+      },
+      [setOpenProp, open],
+    );
+
+    // Helper to toggle the sidebar.
+    const toggleSidebar = React.useCallback(() => {
+      return isMobile
+        ? setOpenMobile((open) => !open)
+        : setOpen((open) => !open);
+    }, [isMobile, setOpen]);
+
+    // Adds a keyboard shortcut to toggle the sidebar.
+    React.useEffect(() => {
+      const handleKeyDown = (event: KeyboardEvent) => {
+        if (
+          event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
+          (event.metaKey || event.ctrlKey)
+        ) {
+          event.preventDefault();
+          toggleSidebar();
+        }
+      };
+
+      window.addEventListener("keydown", handleKeyDown);
+      return () => window.removeEventListener("keydown", handleKeyDown);
+    }, [toggleSidebar]);
+
+    // We add a state so that we can do data-state="expanded" or "collapsed".
+    // This makes it easier to style the sidebar with Tailwind classes.
+    const state = open ? "expanded" : "collapsed";
+
+    const contextValue = React.useMemo<SidebarContextProps>(
+      () => ({
+        state,
+        open,
+        setOpen,
+        isMobile,
+        openMobile,
+        setOpenMobile,
+        toggleSidebar,
+      }),
+      [state, open, setOpen, isMobile, openMobile, toggleSidebar],
+    );
+
+    return (
+      <SidebarContext.Provider value={contextValue}>
+        <TooltipProvider delayDuration={0}>
+          <div
+            style={
+              {
+                "--sidebar-width": SIDEBAR_WIDTH,
+                "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
+                ...style,
+              } as React.CSSProperties
+            }
+            className={cn(
+              "group/sidebar-wrapper flex min-h-svh w-full has-[[data-variant=inset]]:bg-sidebar",
+              className,
+            )}
+            ref={ref}
+            {...props}
+          >
+            {children}
+          </div>
+        </TooltipProvider>
+      </SidebarContext.Provider>
+    );
+  },
+);
+SidebarProvider.displayName = "SidebarProvider";
+
+const Sidebar = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> & {
+    side?: "left" | "right";
+    variant?: "sidebar" | "floating" | "inset";
+    collapsible?: "offcanvas" | "icon" | "none";
+  }
+>(
+  (
+    {
+      side = "left",
+      variant = "sidebar",
+      collapsible = "offcanvas",
+      className,
+      children,
+      ...props
+    },
+    ref,
+  ) => {
+    const { isMobile, state, openMobile, setOpenMobile } = useSidebar();
+
+    if (collapsible === "none") {
+      return (
+        <div
+          className={cn(
+            "flex h-full w-[--sidebar-width] flex-col bg-sidebar text-sidebar-foreground",
+            className,
+          )}
+          ref={ref}
+          {...props}
+        >
+          {children}
+        </div>
+      );
+    }
+
+    if (isMobile) {
+      return (
+        <Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}>
+          <SheetContent
+            data-sidebar="sidebar"
+            data-mobile="true"
+            className="w-[--sidebar-width] bg-sidebar p-0 text-sidebar-foreground [&>button]:hidden"
+            style={
+              {
+                "--sidebar-width": SIDEBAR_WIDTH_MOBILE,
+              } as React.CSSProperties
+            }
+            side={side}
+          >
+            <SheetHeader className="sr-only">
+              <SheetTitle>Sidebar</SheetTitle>
+              <SheetDescription>Displays the mobile sidebar.</SheetDescription>
+            </SheetHeader>
+            <div className="flex h-full w-full flex-col">{children}</div>
+          </SheetContent>
+        </Sheet>
+      );
+    }
+
+    return (
+      <div
+        ref={ref}
+        className="group peer relative hidden flex-shrink-0 text-sidebar-foreground md:block"
+        data-state={state}
+        data-collapsible={state === "collapsed" ? collapsible : ""}
+        data-variant={variant}
+        data-side={side}
+      >
+        {/* This is what handles the sidebar gap on desktop */}
+        <div
+          className={cn(
+            "relative w-[--sidebar-width] bg-transparent transition-[width] duration-200 ease-linear",
+            "group-data-[collapsible=offcanvas]:w-0",
+            "group-data-[side=right]:rotate-180",
+            variant === "floating" || variant === "inset"
+              ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4))]"
+              : "group-data-[collapsible=icon]:w-[--sidebar-width-icon]",
+          )}
+        />
+        <div
+          className={cn(
+            "absolute inset-y-0 z-10 hidden h-full w-[--sidebar-width] transition-[left,right,width] duration-200 ease-linear md:flex",
+            side === "left"
+              ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
+              : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
+            // Adjust the padding for floating and inset variants.
+            variant === "floating" || variant === "inset"
+              ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
+              : "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l",
+            className,
+          )}
+          {...props}
+        >
+          <div
+            data-sidebar="sidebar"
+            className="flex h-full w-full flex-col bg-sidebar group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-sidebar-border group-data-[variant=floating]:shadow"
+          >
+            {children}
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
+Sidebar.displayName = "Sidebar";
+
+const SidebarTrigger = React.forwardRef<
+  React.ElementRef<typeof Button>,
+  React.ComponentProps<typeof Button>
+>(({ className, onClick, ...props }, ref) => {
+  const { toggleSidebar } = useSidebar();
+
+  return (
+    <Button
+      ref={ref}
+      data-sidebar="trigger"
+      variant="ghost"
+      size="icon"
+      className={cn("h-7 w-7", className)}
+      onClick={(event) => {
+        onClick?.(event);
+        toggleSidebar();
+      }}
+      {...props}
+    >
+      <PanelLeft />
+      <span className="sr-only">Toggle Sidebar</span>
+    </Button>
+  );
+});
+SidebarTrigger.displayName = "SidebarTrigger";
+
+const SidebarRail = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<"button">
+>(({ className, ...props }, ref) => {
+  const { toggleSidebar } = useSidebar();
+
+  return (
+    <button
+      ref={ref}
+      data-sidebar="rail"
+      aria-label="Toggle Sidebar"
+      tabIndex={-1}
+      onClick={toggleSidebar}
+      title="Toggle Sidebar"
+      className={cn(
+        "-translate-x-1/2 group-data-[side=left]:-right-4 absolute inset-y-0 z-20 hidden w-4 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-sidebar-border group-data-[side=right]:left-0 sm:flex",
+        "[[data-side=left]_&]:cursor-w-resize [[data-side=right]_&]:cursor-e-resize",
+        "[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
+        "group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:hover:bg-sidebar group-data-[collapsible=offcanvas]:after:left-full",
+        "[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
+        "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarRail.displayName = "SidebarRail";
+
+const SidebarInset = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"main">
+>(({ className, ...props }, ref) => {
+  return (
+    <main
+      ref={ref}
+      className={cn(
+        "relative flex w-full flex-1 flex-col bg-background",
+        "md:peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarInset.displayName = "SidebarInset";
+
+const SidebarInput = React.forwardRef<
+  React.ElementRef<typeof Input>,
+  React.ComponentProps<typeof Input>
+>(({ className, ...props }, ref) => {
+  return (
+    <Input
+      ref={ref}
+      data-sidebar="input"
+      className={cn(
+        "h-8 w-full bg-background shadow-none focus-visible:ring-2 focus-visible:ring-sidebar-ring",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarInput.displayName = "SidebarInput";
+
+const SidebarHeader = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      data-sidebar="header"
+      className={cn("flex flex-col gap-2 p-2", className)}
+      {...props}
+    />
+  );
+});
+SidebarHeader.displayName = "SidebarHeader";
+
+const SidebarFooter = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      data-sidebar="footer"
+      className={cn("flex flex-col gap-2 p-2", className)}
+      {...props}
+    />
+  );
+});
+SidebarFooter.displayName = "SidebarFooter";
+
+const SidebarSeparator = React.forwardRef<
+  React.ElementRef<typeof Separator>,
+  React.ComponentProps<typeof Separator>
+>(({ className, ...props }, ref) => {
+  return (
+    <Separator
+      ref={ref}
+      data-sidebar="separator"
+      className={cn("mx-2 w-auto bg-sidebar-border", className)}
+      {...props}
+    />
+  );
+});
+SidebarSeparator.displayName = "SidebarSeparator";
+
+const SidebarContent = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      data-sidebar="content"
+      className={cn(
+        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarContent.displayName = "SidebarContent";
+
+const SidebarGroup = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      data-sidebar="group"
+      className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
+      {...props}
+    />
+  );
+});
+SidebarGroup.displayName = "SidebarGroup";
+
+const SidebarGroupLabel = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> & { asChild?: boolean }
+>(({ className, asChild = false, ...props }, ref) => {
+  const Comp = asChild ? Slot : "div";
+
+  return (
+    <Comp
+      ref={ref}
+      data-sidebar="group-label"
+      className={cn(
+        "flex h-8 shrink-0 items-center rounded-md px-2 font-medium text-sidebar-foreground/70 text-xs outline-none ring-sidebar-ring transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+        "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarGroupLabel.displayName = "SidebarGroupLabel";
+
+const SidebarGroupAction = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<"button"> & { asChild?: boolean }
+>(({ className, asChild = false, ...props }, ref) => {
+  const Comp = asChild ? Slot : "button";
+
+  return (
+    <Comp
+      ref={ref}
+      data-sidebar="group-action"
+      className={cn(
+        "absolute top-3.5 right-3 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0",
+        // Increases the hit area of the button on mobile.
+        "after:-inset-2 after:absolute after:md:hidden",
+        "group-data-[collapsible=icon]:hidden",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarGroupAction.displayName = "SidebarGroupAction";
+
+const SidebarGroupContent = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    data-sidebar="group-content"
+    className={cn("w-full text-sm", className)}
+    {...props}
+  />
+));
+SidebarGroupContent.displayName = "SidebarGroupContent";
+
+const SidebarMenu = React.forwardRef<
+  HTMLUListElement,
+  React.ComponentProps<"ul">
+>(({ className, ...props }, ref) => (
+  <ul
+    ref={ref}
+    data-sidebar="menu"
+    className={cn("flex w-full min-w-0 flex-col gap-1", className)}
+    {...props}
+  />
+));
+SidebarMenu.displayName = "SidebarMenu";
+
+const SidebarMenuItem = React.forwardRef<
+  HTMLLIElement,
+  React.ComponentProps<"li">
+>(({ className, ...props }, ref) => (
+  <li
+    ref={ref}
+    data-sidebar="menu-item"
+    className={cn("group/menu-item relative", className)}
+    {...props}
+  />
+));
+SidebarMenuItem.displayName = "SidebarMenuItem";
+
+const sidebarMenuButtonVariants = cva(
+  "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-accent data-[active=true]:font-medium data-[active=true]:text-sidebar-accent-foreground data-[state=open]:hover:bg-sidebar-accent data-[state=open]:hover:text-sidebar-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+  {
+    variants: {
+      variant: {
+        default: "hover:bg-sidebar-accent hover:text-sidebar-accent-foreground",
+        outline:
+          "bg-background shadow-[0_0_0_1px_hsl(var(--sidebar-border))] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidebar-accent))]",
+      },
+      size: {
+        default: "h-8 text-sm",
+        sm: "h-7 text-xs",
+        lg: "h-12 text-sm group-data-[collapsible=icon]:!p-0",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  },
+);
+
+const SidebarMenuButton = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<"button"> & {
+    asChild?: boolean;
+    isActive?: boolean;
+    tooltip?: string | React.ComponentProps<typeof TooltipContent>;
+  } & VariantProps<typeof sidebarMenuButtonVariants>
+>(
+  (
+    {
+      asChild = false,
+      isActive = false,
+      variant = "default",
+      size = "default",
+      tooltip,
+      className,
+      ...props
+    },
+    ref,
+  ) => {
+    const Comp = asChild ? Slot : "button";
+    const { isMobile, state } = useSidebar();
+
+    const button = (
+      <Comp
+        ref={ref}
+        data-sidebar="menu-button"
+        data-size={size}
+        data-active={isActive}
+        className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
+        {...props}
+      />
+    );
+
+    if (!tooltip) {
+      return button;
+    }
+
+    if (typeof tooltip === "string") {
+      tooltip = {
+        children: tooltip,
+      };
+    }
+
+    return (
+      <Tooltip>
+        <TooltipTrigger asChild>{button}</TooltipTrigger>
+        <TooltipContent
+          side="right"
+          align="center"
+          hidden={state !== "collapsed" || isMobile}
+          {...tooltip}
+        />
+      </Tooltip>
+    );
+  },
+);
+SidebarMenuButton.displayName = "SidebarMenuButton";
+
+const SidebarMenuAction = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<"button"> & {
+    asChild?: boolean;
+    showOnHover?: boolean;
+  }
+>(({ className, asChild = false, showOnHover = false, ...props }, ref) => {
+  const Comp = asChild ? Slot : "button";
+
+  return (
+    <Comp
+      ref={ref}
+      data-sidebar="menu-action"
+      className={cn(
+        "absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-sidebar-foreground outline-none ring-sidebar-ring transition-transform hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 peer-hover/menu-button:text-sidebar-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
+        // Increases the hit area of the button on mobile.
+        "after:-inset-2 after:absolute after:md:hidden",
+        "peer-data-[size=sm]/menu-button:top-1",
+        "peer-data-[size=default]/menu-button:top-1.5",
+        "peer-data-[size=lg]/menu-button:top-2.5",
+        "group-data-[collapsible=icon]:hidden",
+        showOnHover &&
+          "group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 peer-data-[active=true]/menu-button:text-sidebar-accent-foreground md:opacity-0",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarMenuAction.displayName = "SidebarMenuAction";
+
+const SidebarMenuBadge = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    data-sidebar="menu-badge"
+    className={cn(
+      "pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-md px-1 font-medium text-sidebar-foreground text-xs tabular-nums",
+      "peer-hover/menu-button:text-sidebar-accent-foreground peer-data-[active=true]/menu-button:text-sidebar-accent-foreground",
+      "peer-data-[size=sm]/menu-button:top-1",
+      "peer-data-[size=default]/menu-button:top-1.5",
+      "peer-data-[size=lg]/menu-button:top-2.5",
+      "group-data-[collapsible=icon]:hidden",
+      className,
+    )}
+    {...props}
+  />
+));
+SidebarMenuBadge.displayName = "SidebarMenuBadge";
+
+const SidebarMenuSkeleton = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> & {
+    showIcon?: boolean;
+  }
+>(({ className, showIcon = false, ...props }, ref) => {
+  // Random width between 50 to 90%.
+  const width = React.useMemo(() => {
+    return `${Math.floor(Math.random() * 40) + 50}%`;
+  }, []);
+
+  return (
+    <div
+      ref={ref}
+      data-sidebar="menu-skeleton"
+      className={cn("flex h-8 items-center gap-2 rounded-md px-2", className)}
+      {...props}
+    >
+      {showIcon && (
+        <Skeleton
+          className="size-4 rounded-md"
+          data-sidebar="menu-skeleton-icon"
+        />
+      )}
+      <Skeleton
+        className="h-4 max-w-[--skeleton-width] flex-1"
+        data-sidebar="menu-skeleton-text"
+        style={
+          {
+            "--skeleton-width": width,
+          } as React.CSSProperties
+        }
+      />
+    </div>
+  );
+});
+SidebarMenuSkeleton.displayName = "SidebarMenuSkeleton";
+
+const SidebarMenuSub = React.forwardRef<
+  HTMLUListElement,
+  React.ComponentProps<"ul">
+>(({ className, ...props }, ref) => (
+  <ul
+    ref={ref}
+    data-sidebar="menu-sub"
+    className={cn(
+      "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-sidebar-border border-l px-2.5 py-0.5",
+      "group-data-[collapsible=icon]:hidden",
+      className,
+    )}
+    {...props}
+  />
+));
+SidebarMenuSub.displayName = "SidebarMenuSub";
+
+const SidebarMenuSubItem = React.forwardRef<
+  HTMLLIElement,
+  React.ComponentProps<"li">
+>(({ ...props }, ref) => <li ref={ref} {...props} />);
+SidebarMenuSubItem.displayName = "SidebarMenuSubItem";
+
+const SidebarMenuSubButton = React.forwardRef<
+  HTMLAnchorElement,
+  React.ComponentProps<"a"> & {
+    asChild?: boolean;
+    size?: "sm" | "md";
+    isActive?: boolean;
+  }
+>(({ asChild = false, size = "md", isActive, className, ...props }, ref) => {
+  const Comp = asChild ? Slot : "a";
+
+  return (
+    <Comp
+      ref={ref}
+      data-sidebar="menu-sub-button"
+      data-size={size}
+      data-active={isActive}
+      className={cn(
+        "-translate-x-px flex h-7 min-w-0 items-center gap-2 overflow-hidden rounded-md px-2 text-sidebar-foreground outline-none ring-sidebar-ring hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 active:bg-sidebar-accent active:text-sidebar-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-accent-foreground",
+        "data-[active=true]:bg-sidebar-accent data-[active=true]:text-sidebar-accent-foreground",
+        size === "sm" && "text-xs",
+        size === "md" && "text-sm",
+        "group-data-[collapsible=icon]:hidden",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarMenuSubButton.displayName = "SidebarMenuSubButton";
+
+export {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupAction,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarHeader,
+  SidebarInput,
+  SidebarInset,
+  SidebarMenu,
+  SidebarMenuAction,
+  SidebarMenuBadge,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSkeleton,
+  SidebarMenuSub,
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+  SidebarProvider,
+  SidebarRail,
+  SidebarSeparator,
+  SidebarTrigger,
+  useSidebar,
+};
@@ -10,35 +10,25 @@ import {
 } from "@/components/ui/table";
 import type { Meta, StoryObj } from "@storybook/react";
 import Link from "next/link";
-import { BadgeContainer, mobileViewport } from "../../../stories/utils";
+import { BadgeContainer } from "../../../stories/utils";
 import { cn } from "../../lib/utils";
 import { Badge } from "./badge";

 const meta = {
  title: "Shadcn/Table",
  component: Component,
-  parameters: {
-    layout: "centered",
-  },
 } satisfies Meta<typeof Component>;

 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Component() {
  return (
-    <div className="flex min-w-0 flex-col gap-6 px-4 py-6 lg:mx-auto lg:max-w-[1000px]">
+    <div className="container flex max-w-6xl flex-col gap-10 py-10">
      <BadgeContainer label="Normal">
        <TableDemo />
      </BadgeContainer>
@@ -7,6 +7,7 @@ import { usePathname } from "next/navigation";
 import { useCallback, useRef, useState } from "react";
 import { ScrollShadow } from "./ScrollShadow/ScrollShadow";
 import { Button } from "./button";
+import { ToolTipLabel } from "./tooltip";

 export type TabLink = {
  name: string;
@@ -20,6 +21,7 @@ export function TabLinks(props: {
  className?: string;
  tabContainerClassName?: string;
  shadowColor?: string;
+  scrollableClassName?: string;
 }) {
  const { containerRef, lineRef, activeTabRef } =
    useUnderline<HTMLAnchorElement>();
@@ -30,7 +32,7 @@ export function TabLinks(props: {
      <div className="absolute right-0 bottom-0 left-0 h-[1px] bg-border" />

      <ScrollShadow
-        scrollableClassName="pb-[8px] relative"
+        scrollableClassName={cn("pb-[8px] relative", props.scrollableClassName)}
        shadowColor={props.shadowColor}
      >
        <div
@@ -81,6 +83,7 @@ export function TabButtons(props: {
    isActive: boolean;
    isDisabled?: boolean;
    icon?: React.FC<{ className?: string }>;
+    toolTip?: string;
  }[];
  tabClassName?: string;
  activeTabClassName?: string;
@@ -110,26 +113,31 @@ export function TabButtons(props: {
        >
          {props.tabs.map((tab, index) => {
            return (
-              <Button
-                // biome-ignore lint/suspicious/noArrayIndexKey: tabs don't change order, so index is stable
-                key={index}
-                variant="ghost"
-                ref={tab.isActive ? activeTabRef : undefined}
-                className={cn(
-                  "relative inline-flex h-auto items-center gap-1.5 rounded-lg px-2 font-medium text-sm hover:bg-accent lg:px-3 lg:text-base",
-                  !tab.isActive &&
-                    "text-muted-foreground hover:text-foreground",
-                  tab.isDisabled && "cursor-not-allowed opacity-50",
-                  props.tabClassName,
-                  tab.isActive && props.activeTabClassName,
-                )}
-                onClick={!tab.isDisabled ? tab.onClick : undefined}
+              <ToolTipLabel
+                key={typeof tab.name === "string" ? tab.name : index}
+                label={tab.toolTip}
              >
-                {tab.icon && (
-                  <tab.icon className={cn("size-6", props.tabIconClassName)} />
-                )}
-                {tab.name}
-              </Button>
+                <Button
+                  variant="ghost"
+                  ref={tab.isActive ? activeTabRef : undefined}
+                  className={cn(
+                    "relative inline-flex h-auto items-center gap-1.5 rounded-lg px-2 font-medium text-sm hover:bg-accent lg:px-3 lg:text-base",
+                    !tab.isActive &&
+                      "text-muted-foreground hover:text-foreground",
+                    tab.isDisabled && "cursor-not-allowed opacity-50",
+                    props.tabClassName,
+                    tab.isActive && props.activeTabClassName,
+                  )}
+                  onClick={!tab.isDisabled ? tab.onClick : undefined}
+                >
+                  {tab.icon && (
+                    <tab.icon
+                      className={cn("size-6", props.tabIconClassName)}
+                    />
+                  )}
+                  {tab.name}
+                </Button>
+              </ToolTipLabel>
            );
          })}
        </div>
@@ -159,9 +167,11 @@ function useUnderline<El extends HTMLElement>() {
        const containerRect = containerRef.current.getBoundingClientRect();
        const lineEl = lineRef.current;
        const rect = activeTabEl.getBoundingClientRect();
+        const containerPaddingLeft =
+          containerRect.left - containerRef.current.offsetLeft;
        lineEl.style.width = `${rect.width}px`;
        lineEl.style.transform = `translateX(${
-          rect.left - containerRect.left
+          rect.left - containerPaddingLeft
        }px)`;
        setTimeout(() => {
          lineEl.style.transition = "transform 0.3s, width 0.3s";
@@ -205,6 +215,7 @@ export function TabPathLinks(props: {
  className?: string;
  tabContainerClassName?: string;
  shadowColor?: string;
+  scrollableClassName?: string;
 }) {
  const pathname = usePathname() || "";
  const { links, ...restProps } = props;
@@ -0,0 +1,21 @@
+import * as React from "react";
+
+const MOBILE_BREAKPOINT = 768;
+
+export function useIsMobile() {
+  const [isMobile, setIsMobile] = React.useState<boolean | undefined>(
+    undefined,
+  );
+
+  React.useEffect(() => {
+    const mql = window.matchMedia(`(max-width: ${MOBILE_BREAKPOINT - 1}px)`);
+    const onChange = () => {
+      setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+    };
+    mql.addEventListener("change", onChange);
+    setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
+    return () => mql.removeEventListener("change", onChange);
+  }, []);
+
+  return !!isMobile;
+}
@@ -3,6 +3,8 @@ export type ProductSKU =
  | "plan:starter"
  | "plan:growth"
  | "plan:custom"
+  | "plan:accelerate"
+  | "plan:scale"
  | "product:ecosystem_wallets"
  | "product:engine_standard"
  | "product:engine_premium"
@@ -15,8 +15,6 @@ import invariant from "tiny-invariant";
 import type { EngineStatus } from "../../../app/team/[team_slug]/(team)/~/engine/(instance)/[engineId]/overview/components/transactions-table";
 import { engineKeys } from "../cache-keys";

-export type EngineTier = "STARTER" | "PREMIUM" | "ENTERPRISE";
-
 // Engine instances
 export type EngineInstance = {
  id: string;
@@ -24,6 +22,8 @@ export type EngineInstance = {
  name: string;
  url: string;
  lastAccessedAt: string;
+  isCloudHosted: boolean;
+  isPlanEngine: boolean;
  status:
    | "active"
    | "pending"
@@ -5,6 +5,7 @@ import invariant from "tiny-invariant";
 export function useWalletNFTs(params: {
  chainId: number;
  walletAddress?: string;
+  isInsightSupported: boolean;
 }) {
  return useQuery({
    queryKey: ["walletNfts", params.chainId, params.walletAddress],
@@ -13,6 +14,7 @@ export function useWalletNFTs(params: {
      return getWalletNFTs({
        chainId: params.chainId,
        owner: params.walletAddress,
+        isInsightSupported: params.isInsightSupported,
      });
    },
    enabled: !!params.walletAddress,
@@ -47,7 +47,7 @@ export const SearchInput: React.FC = () => {
    <div className="group relative w-full">
      <SearchIcon className="-translate-y-1/2 absolute top-[50%] left-3 size-4 text-muted-foreground" />
      <Input
-        placeholder="Search by token address or chain ID"
+        placeholder="Search with anything!"
        className="h-10 rounded-lg bg-card py-2 pl-9 lg:min-w-[300px]"
        defaultValue={searchParams?.get("query") || ""}
        onChange={(e) => handleSearch(e.target.value)}
@@ -7,6 +7,7 @@ import {
  TableRow,
 } from "@/components/ui/table";
 import type { Address } from "thirdweb";
+import { checksumAddress } from "thirdweb/utils";
 import { getRoutes } from "../../../utils";
 import { ChainlistPagination } from "../client/pagination";
 import { RouteListCard } from "../server/routelist-card";
@@ -34,28 +35,83 @@ async function getRoutesToRender(params: SearchParams) {
    originTokenAddress?: Address;
    destinationChainId?: number;
    destinationTokenAddress?: Address;
+    originTextQuery?: string;
+    destinationTextQuery?: string;
  }> = {};

  if (params.type === "origin" || typeof params.type === "undefined") {
    if (params.query?.startsWith("0x")) {
      filters.originTokenAddress = params.query as Address;
-    } else if (params.query) {
+    } else if (Number.isInteger(Number(params.query))) {
      filters.originChainId = Number(params.query);
+    } else if (params.query) {
+      filters.originTextQuery = params.query;
    }
  } else if (params.type === "destination") {
    if (params.query?.startsWith("0x")) {
      filters.destinationTokenAddress = params.query as Address;
-    } else if (params.query) {
+    } else if (Number.isInteger(Number(params.query))) {
      filters.destinationChainId = Number(params.query);
+    } else if (params.query) {
+      filters.destinationTextQuery = params.query;
    }
  }
  // Temporary, will update this after the /routes endpoint
-  filters.limit = 50_000;
-
-  const routes = await getRoutes(filters);
+  let routes = await getRoutes({ limit: 100_000 });

  const totalCount = routes.length;

+  if (filters.originChainId) {
+    routes = routes.filter(
+      (route) => route.originToken.chainId === filters.originChainId,
+    );
+  }
+  if (filters.originTokenAddress) {
+    const originTokenAddress = filters.originTokenAddress;
+    routes = routes.filter(
+      (route) =>
+        checksumAddress(route.originToken.address) ===
+        checksumAddress(originTokenAddress),
+    );
+  }
+  if (filters.destinationChainId) {
+    routes = routes.filter(
+      (route) => route.destinationToken.chainId === filters.destinationChainId,
+    );
+  }
+  if (filters.destinationTokenAddress) {
+    const destinationTokenAddress = filters.destinationTokenAddress;
+    routes = routes.filter(
+      (route) =>
+        checksumAddress(route.destinationToken.address) ===
+        checksumAddress(destinationTokenAddress),
+    );
+  }
+
+  if (filters.originTextQuery) {
+    const originTextQuery = filters.originTextQuery.toLowerCase();
+    routes = routes.filter((route) => {
+      return (
+        route.originToken.name.toLowerCase().includes(originTextQuery) ||
+        route.originToken.symbol.toLowerCase().includes(originTextQuery)
+      );
+    });
+  }
+
+  if (filters.destinationTextQuery) {
+    const destinationTextQuery = filters.destinationTextQuery.toLowerCase();
+    routes = routes.filter((route) => {
+      return (
+        route.destinationToken.name
+          .toLowerCase()
+          .includes(destinationTextQuery) ||
+        route.destinationToken.symbol
+          .toLowerCase()
+          .includes(destinationTextQuery)
+      );
+    });
+  }
+
  return {
    routesToRender: routes,
    totalCount,
@@ -154,13 +210,21 @@ export async function RoutesData(props: {
        out of{" "}
        {filteredCount !== totalCount ? (
          <>
-            <span className="text-accent-foreground">{filteredCount}</span>{" "}
+            <span className="text-accent-foreground">
+              {filteredCount.toLocaleString()}
+            </span>{" "}
            routes that match filters. (Total:{" "}
-            <span className="text-accent-foreground">{totalCount}</span>)
+            <span className="text-accent-foreground">
+              {totalCount.toLocaleString()}
+            </span>
+            )
          </>
        ) : (
          <>
-            <span className="text-accent-foreground">{totalCount}</span> routes.
+            <span className="text-accent-foreground">
+              {totalCount.toLocaleString()}
+            </span>{" "}
+            routes.
          </>
        )}
      </p>
@@ -2,43 +2,18 @@ import "server-only";

 import { BRIDGE_URL, DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/env";
 import { getAuthToken } from "app/api/lib/getAuthToken";
-import type { Address } from "thirdweb";
 import type { Route } from "./types/route";

 export async function getRoutes({
  limit,
-  offset,
-  originChainId,
-  originTokenAddress,
-  destinationChainId,
-  destinationTokenAddress,
 }: {
  limit?: number;
-  offset?: number;
-  originChainId?: number;
-  originTokenAddress?: Address;
-  destinationChainId?: number;
-  destinationTokenAddress?: Address;
 } = {}) {
  const url = new URL(`${BRIDGE_URL}/v1/routes`);
  if (limit) {
    url.searchParams.set("limit", limit.toString());
  }
-  if (offset) {
-    url.searchParams.set("offset", offset.toString());
-  }
-  if (originChainId) {
-    url.searchParams.set("originChainId", originChainId.toString());
-  }
-  if (originTokenAddress) {
-    url.searchParams.set("originTokenAddress", originTokenAddress);
-  }
-  if (destinationChainId) {
-    url.searchParams.set("destinationChainId", destinationChainId.toString());
-  }
-  if (destinationTokenAddress) {
-    url.searchParams.set("destinationTokenAddress", destinationTokenAddress);
-  }
+  // It's faster to filter client side, doesn't seem to be a big performance boost to paginate/filter server side
  const token = await getAuthToken();
  const routesResponse = await fetch(url, {
    headers: token
@@ -28,7 +28,7 @@ export function BuyFundsSection(props: { chain: ChainMetadata }) {
          <div className="h-6" />

          <h2 className="px-4 text-center font-semibold text-lg tracking-tight">
-            Buy Funds on {sanitizedChainName} using thirdweb Pay
+            Buy Funds on {sanitizedChainName} using Universal Bridge
          </h2>

          <div className="h-2" />
@@ -50,8 +50,9 @@ export function BuyFundsSection(props: { chain: ChainMetadata }) {
          <Link
            href="https://portal.thirdweb.com/connect/pay/overview"
            className="inline-flex items-center gap-1.5 text-muted-foreground text-sm hover:text-foreground"
+            target="_blank"
          >
-            Learn more about thirdweb Pay
+            Learn more about Universal Bridge
            <ExternalLinkIcon className="size-3" />
          </Link>
        </div>
@@ -13,7 +13,6 @@ import { ListerOnly } from "@3rdweb-sdk/react/components/roles/lister-only";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
 import { isAlchemySupported } from "lib/wallet/nfts/alchemy";
 import { isMoralisSupported } from "lib/wallet/nfts/moralis";
-import { useSimplehashSupport } from "lib/wallet/nfts/simpleHash";
 import { PlusIcon } from "lucide-react";
 import { useState } from "react";
 import type { ThirdwebContract } from "thirdweb";
@@ -25,6 +24,7 @@ interface CreateListingButtonProps {
  createText?: string;
  type?: "direct-listings" | "english-auctions";
  twAccount: Account | undefined;
+  isInsightSupported: boolean;
 }

 const LISTING_MODES = ["Select NFT", "Manual"] as const;
@@ -34,6 +34,7 @@ export const CreateListingButton: React.FC<CreateListingButtonProps> = ({
  type,
  contract,
  twAccount,
+  isInsightSupported,
  ...restButtonProps
 }) => {
  const address = useActiveAccount()?.address;
@@ -41,13 +42,12 @@ export const CreateListingButton: React.FC<CreateListingButtonProps> = ({
  const [listingMode, setListingMode] =
    useState<(typeof LISTING_MODES)[number]>("Select NFT");

-  const simplehashQuery = useSimplehashSupport(contract.chain.id);
-
  const isSupportedChain =
    contract.chain.id &&
-    (simplehashQuery.data ||
+    (isInsightSupported ||
      isAlchemySupported(contract.chain.id) ||
      isMoralisSupported(contract.chain.id));
+
  return (
    <ListerOnly contract={contract}>
      <Sheet open={open} onOpenChange={setOpen}>
@@ -83,6 +83,7 @@ export const CreateListingButton: React.FC<CreateListingButtonProps> = ({
                  actionText={createText}
                  setOpen={setOpen}
                  mode={listingMode === "Select NFT" ? "automatic" : "manual"}
+                  isInsightSupported={isInsightSupported}
                />
              </div>
            </>
@@ -95,6 +96,7 @@ export const CreateListingButton: React.FC<CreateListingButtonProps> = ({
                actionText={createText}
                setOpen={setOpen}
                mode="manual"
+                isInsightSupported={isInsightSupported}
              />
            </div>
          )}
@@ -21,7 +21,6 @@ import { useAllChainsData } from "hooks/chains/allChains";
 import { useTxNotifications } from "hooks/useTxNotifications";
 import { isAlchemySupported } from "lib/wallet/nfts/alchemy";
 import { isMoralisSupported } from "lib/wallet/nfts/moralis";
-import { useSimplehashSupport } from "lib/wallet/nfts/simpleHash";
 import type { WalletNFT } from "lib/wallet/nfts/types";
 import { CircleAlertIcon, InfoIcon } from "lucide-react";
 import Link from "next/link";
@@ -87,6 +86,7 @@ type CreateListingsFormProps = {
  mode: "automatic" | "manual";
  type?: "direct-listings" | "english-auctions";
  twAccount: Account | undefined;
+  isInsightSupported: boolean;
 };

 const auctionTimes = [
@@ -106,16 +106,17 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
  setOpen,
  twAccount,
  mode,
+  isInsightSupported,
 }) => {
  const trackEvent = useTrack();
  const chainId = contract.chain.id;
  const { idToChain } = useAllChainsData();
  const network = idToChain.get(chainId);
  const [isFormLoading, setIsFormLoading] = useState(false);
-  const simplehashQuery = useSimplehashSupport(contract.chain.id);
+
  const isSupportedChain =
    chainId &&
-    (!!simplehashQuery.data ||
+    (isInsightSupported ||
      isAlchemySupported(chainId) ||
      isMoralisSupported(chainId));

@@ -124,7 +125,9 @@ export const CreateListingsForm: React.FC<CreateListingsFormProps> = ({
  const { data: walletNFTs, isPending: isWalletNFTsLoading } = useWalletNFTs({
    chainId,
    walletAddress: account?.address,
+    isInsightSupported,
  });
+
  const sendAndConfirmTx = useSendAndConfirmTransaction();
  const listingNotifications = useTxNotifications(
    "NFT listed Successfully",
@@ -29,6 +29,7 @@ export function ContractDirectListingsPageClient(props: {
    <ContractDirectListingsPage
      contract={props.contract}
      twAccount={props.twAccount}
+      isInsightSupported={metadataQuery.data.isInsightSupported}
    />
  );
 }
@@ -8,17 +8,21 @@ import { DirectListingsTable } from "./components/table";
 interface ContractDirectListingsPageProps {
  contract: ThirdwebContract;
  twAccount: Account | undefined;
+  isInsightSupported: boolean;
 }

 export const ContractDirectListingsPage: React.FC<
  ContractDirectListingsPageProps
-> = ({ contract, twAccount }) => {
+> = ({ contract, twAccount, isInsightSupported }) => {
  return (
    <div className="flex flex-col gap-6">
      <div className="flex flex-row items-center justify-between">
-        <p className="text-lg">Contract Listings</p>
+        <h2 className="font-semibold text-2xl tracking-tight">
+          Direct Listings
+        </h2>
        <div className="flex flex-row gap-4">
          <CreateListingButton
+            isInsightSupported={isInsightSupported}
            contract={contract}
            type="direct-listings"
            createText="Create Direct Listing"
@@ -29,15 +29,18 @@ export default async function Page(props: {
    );
  }

-  const { isDirectListingSupported } = await getContractPageMetadata(
-    info.contract,
-  );
+  const { isDirectListingSupported, isInsightSupported } =
+    await getContractPageMetadata(info.contract);

  if (!isDirectListingSupported) {
    redirect(`/${params.chain_id}/${params.contractAddress}`);
  }

  return (
-    <ContractDirectListingsPage contract={info.contract} twAccount={account} />
+    <ContractDirectListingsPage
+      contract={info.contract}
+      twAccount={account}
+      isInsightSupported={isInsightSupported}
+    />
  );
 }
@@ -29,6 +29,7 @@ export function ContractEnglishAuctionsPageClient(props: {
    <ContractEnglishAuctionsPage
      contract={props.contract}
      twAccount={props.twAccount}
+      isInsightSupported={metadataQuery.data.isInsightSupported}
    />
  );
 }
@@ -8,21 +8,25 @@ import { EnglishAuctionsTable } from "./components/table";
 interface ContractEnglishAuctionsProps {
  contract: ThirdwebContract;
  twAccount: Account | undefined;
+  isInsightSupported: boolean;
 }

 export const ContractEnglishAuctionsPage: React.FC<
  ContractEnglishAuctionsProps
-> = ({ contract, twAccount }) => {
+> = ({ contract, twAccount, isInsightSupported }) => {
  return (
    <div className="flex flex-col gap-6">
      <div className="flex flex-row items-center justify-between">
-        <p className="text-lg">Contract Auctions</p>
+        <h2 className="font-semibold text-2xl tracking-tight">
+          English Auctions
+        </h2>
        <div className="flex flex-row gap-4">
          <CreateListingButton
            contract={contract}
            type="english-auctions"
            createText="Create English Auction"
            twAccount={twAccount}
+            isInsightSupported={isInsightSupported}
          />
        </div>
      </div>
@@ -30,9 +30,8 @@ export default async function Page(props: {
    );
  }

-  const { isEnglishAuctionSupported } = await getContractPageMetadata(
-    info.contract,
-  );
+  const { isEnglishAuctionSupported, isInsightSupported } =
+    await getContractPageMetadata(info.contract);

  if (!isEnglishAuctionSupported) {
    redirect(`/${params.chain_id}/${params.contractAddress}`);
@@ -42,6 +41,7 @@ export default async function Page(props: {
    <ContractEnglishAuctionsPage
      contract={info.contract}
      twAccount={twAccount}
+      isInsightSupported={isInsightSupported}
    />
  );
 }
@@ -1,14 +1,7 @@
-import {
-  Flex,
-  GridItem,
-  SimpleGrid,
-  Skeleton,
-  SkeletonText,
-  useBreakpointValue,
-} from "@chakra-ui/react";
+import { SkeletonContainer } from "@/components/ui/skeleton";
+import { TrackedLinkTW } from "@/components/ui/tracked-link";
 import { useMemo } from "react";
 import { type NFT, ZERO_ADDRESS } from "thirdweb";
-import { Card, TrackedLink, type TrackedLinkProps } from "tw-components";
 import { NFTMediaWithEmptyState } from "tw-components/nft-media";

 type NFTWithContract = NFT & { contractAddress: string; chainId: number };
@@ -20,7 +13,8 @@ const dummyMetadata: (idx: number) => NFTWithContract = (idx) => ({
  tokenURI: `1-0x123-${idx}`,
  metadata: {
    name: "Loading...",
-    description: "lorem ipsum loading sit amet",
+    description:
+      "lorem ipsum loading sit amet consectetur adipisicing elit. Quisquam, quos.",
    id: BigInt(idx || 0),
    uri: `1-0x123-${idx}`,
  },
@@ -31,7 +25,7 @@ const dummyMetadata: (idx: number) => NFTWithContract = (idx) => ({

 interface NFTCardsProps {
  nfts: Array<NFTWithContract>;
-  trackingCategory: TrackedLinkProps["category"];
+  trackingCategory: string;
  isPending: boolean;
  allNfts?: boolean;
 }
@@ -42,61 +36,82 @@ export const NFTCards: React.FC<NFTCardsProps> = ({
  isPending,
  allNfts,
 }) => {
-  const isMobile = useBreakpointValue({ base: true, md: false });
-
  const dummyData = useMemo(() => {
    return Array.from({
-      length: allNfts ? nfts.length : isMobile ? 2 : 3,
+      length: allNfts ? nfts.length : 3,
    }).map((_, idx) => dummyMetadata(idx));
-  }, [nfts.length, isMobile, allNfts]);
+  }, [nfts.length, allNfts]);

  return (
-    <SimpleGrid
-      gap={{ base: 3, md: 6 }}
-      columns={allNfts ? { base: 2, md: 4 } : { base: 2, md: 3 }}
-    >
+    <div className="grid grid-cols-1 gap-4 lg:grid-cols-3">
      {(isPending ? dummyData : nfts).map((token) => {
        const tokenId = token.id.toString();

        return (
-          <GridItem
+          <div
            key={`${token.chainId}_${token.contractAddress}_${tokenId}`}
-            as={TrackedLink}
-            category={trackingCategory}
-            href={`/${token.chainId}/${token.contractAddress}/nfts/${tokenId}`}
-            _hover={{ opacity: 0.75, textDecoration: "none" }}
+            className="hover:-translate-y-0.5 relative flex h-full cursor-pointer flex-col overflow-hidden rounded-lg bg-background duration-200 hover:scale-[1.01]"
          >
-            <Card p={0} h="full">
-              <div className="relative aspect-square w-full overflow-hidden rounded-xl">
-                <Skeleton isLoaded={!isPending}>
-                  <NFTMediaWithEmptyState
-                    metadata={token.metadata}
-                    requireInteraction
-                    width="100%"
-                    height="100%"
-                  />
-                </Skeleton>
-              </div>
-              <Flex p={4} pb={3} gap={1} direction="column">
-                <Skeleton w={!isPending ? "100%" : "50%"} isLoaded={!isPending}>
-                  <h2 className="font-semibold tracking-tight">
-                    {token.metadata.name}
-                  </h2>
-                </Skeleton>
-                <SkeletonText isLoaded={!isPending}>
-                  <p className="line-clamp-3 text-muted-foreground text-sm">
-                    {token.metadata.description ? (
-                      token.metadata.description
-                    ) : (
-                      <i>No description</i>
-                    )}
-                  </p>
-                </SkeletonText>
-              </Flex>
-            </Card>
-          </GridItem>
+            {/* border */}
+            <div className="absolute inset-0 rounded-lg border border-border" />
+
+            {/* image */}
+            <div className="relative aspect-square w-full overflow-hidden">
+              <SkeletonContainer
+                skeletonData={token.metadata}
+                loadedData={isPending ? undefined : token.metadata}
+                className="h-full w-full rounded-lg"
+                render={(v) => {
+                  return (
+                    <NFTMediaWithEmptyState
+                      metadata={v}
+                      requireInteraction
+                      width="100%"
+                      height="100%"
+                    />
+                  );
+                }}
+              />
+            </div>
+
+            <div className="p-4">
+              {/* title */}
+              <SkeletonContainer
+                skeletonData={token.metadata}
+                loadedData={isPending ? undefined : token.metadata}
+                className="mb-2"
+                render={(v) => {
+                  return (
+                    <h2 className="font-semibold tracking-tight">
+                      <TrackedLinkTW
+                        category={trackingCategory}
+                        label="view_nft"
+                        href={`/${token.chainId}/${token.contractAddress}/nfts/${tokenId}`}
+                        className="before:absolute before:inset-0"
+                      >
+                        {v.name}
+                      </TrackedLinkTW>
+                    </h2>
+                  );
+                }}
+              />
+
+              {/* Description */}
+              <SkeletonContainer
+                skeletonData={token.metadata}
+                loadedData={isPending ? undefined : token.metadata}
+                render={(v) => {
+                  return (
+                    <p className="line-clamp-3 text-muted-foreground text-sm">
+                      {v.description ? v.description : <i>No description</i>}
+                    </p>
+                  );
+                }}
+              />
+            </div>
+          </div>
        );
      })}
-    </SimpleGrid>
+    </div>
  );
 };
@@ -126,7 +126,7 @@ export async function getClaimPhasesInLegacyFormat(
 type PhaseInput = z.input<typeof LegacyClaimConditionInputSchema>;

 export function setClaimPhasesTx(
-  baseOptions: BaseTransactionOptions<Options>,
+  baseOptions: BaseTransactionOptions<Options> & { isSinglePhase?: boolean },
  rawPhases: PhaseInput[],
 ) {
  const phases = rawPhases.map((phase) => {
@@ -172,6 +172,7 @@ export function setClaimPhasesTx(
        contract: baseOptions.contract,
        phases,
        tokenId: baseOptions.tokenId,
+        singlePhaseDrop: baseOptions.isSinglePhase,
      });
  }
 }
@@ -226,7 +226,10 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
      ? { type: "erc20", decimals: tokenDecimals.data }
      : isErc721
        ? { type: "erc721" }
-        : { type: "erc1155", tokenId: BigInt(tokenId || 0) }),
+        : {
+            type: "erc1155",
+            tokenId: BigInt(tokenId || 0),
+          }),
  });

  const transformedQueryData = useMemo(() => {
@@ -370,6 +373,7 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
      const tx = setClaimPhasesTx(
        {
          contract,
+          isSinglePhase: !isMultiPhase,
          ...(isErc20
            ? { type: "erc20", decimals: tokenDecimals.data }
            : isErc721
@@ -635,6 +639,7 @@ export const ClaimConditionsForm: React.FC<ClaimConditionsFormProps> = ({
                  isErc20={isErc20}
                  contract={contract}
                  tokenId={tokenId}
+                  isMultiphase={isMultiPhase}
                />
              )}
            </div>
@@ -10,6 +10,7 @@ interface ClaimConditionsProps {
  isColumn?: true;
  isERC20: boolean;
  twAccount: Account | undefined;
+  isMultiphase: boolean;
 }
 export const ClaimConditions: React.FC<ClaimConditionsProps> = ({
  contract,
@@ -17,6 +18,7 @@ export const ClaimConditions: React.FC<ClaimConditionsProps> = ({
  isColumn,
  isERC20,
  twAccount,
+  isMultiphase,
 }) => {
  return (
    <div className="flex w-full flex-col gap-6">
@@ -37,8 +39,7 @@ export const ClaimConditions: React.FC<ClaimConditionsProps> = ({
        contract={contract}
        tokenId={tokenId}
        isColumn={isColumn}
-        // always multi phase!
-        isMultiPhase={true}
+        isMultiPhase={isMultiphase}
      />
    </div>
  );
@@ -18,6 +18,7 @@ interface ResetClaimEligibilityProps {
  contract: ThirdwebContract;
  tokenId?: string;
  twAccount: Account | undefined;
+  isMultiphase: boolean;
 }

 export const ResetClaimEligibility: React.FC<ResetClaimEligibilityProps> = ({
@@ -25,6 +26,7 @@ export const ResetClaimEligibility: React.FC<ResetClaimEligibilityProps> = ({
  tokenId,
  isErc20,
  twAccount,
+  isMultiphase,
 }) => {
  const trackEvent = useTrack();

@@ -55,6 +57,7 @@ export const ResetClaimEligibility: React.FC<ResetClaimEligibilityProps> = ({
          return ERC1155Ext.resetClaimEligibility({
            contract,
            tokenId: BigInt(tokenId),
+            singlePhaseDrop: !isMultiphase,
          });
        }
        // assume erc 721
@@ -36,33 +36,34 @@ export function ContractPageLayout(props: {

  return (
    <ChakraProviderSetup>
-      <SidebarLayout sidebarLinks={sidebarLinks}>
-        <div className="border-border border-b pb-8">
-          <div className="flex flex-col gap-4 ">
-            <div className="flex flex-col justify-between gap-4 md:flex-row">
-              <ContractMetadata
-                contract={contract}
-                chain={chainMetadata}
-                contractMetadata={dashboardContractMetadata}
-                externalLinks={externalLinks}
-              />
-              <PrimaryDashboardButton
-                contractAddress={contract.address}
-                chain={contract.chain}
-                contractInfo={{
-                  chain: chainMetadata,
-                  chainSlug: chainMetadata.slug,
-                  contractAddress: contract.address,
-                }}
-                teamsAndProjects={teamsAndProjects}
-                client={client}
-              />
-            </div>
-            <DeprecatedAlert chain={chainMetadata} />
+      <div className="border-border border-b py-8">
+        <div className="container flex flex-col gap-4">
+          <div className="flex flex-col justify-between gap-4 md:flex-row">
+            <ContractMetadata
+              contract={contract}
+              chain={chainMetadata}
+              contractMetadata={dashboardContractMetadata}
+              externalLinks={externalLinks}
+            />
+            <PrimaryDashboardButton
+              contractAddress={contract.address}
+              chain={contract.chain}
+              contractInfo={{
+                chain: chainMetadata,
+                chainSlug: chainMetadata.slug,
+                contractAddress: contract.address,
+              }}
+              teamsAndProjects={teamsAndProjects}
+              client={client}
+            />
          </div>
+          <DeprecatedAlert chain={chainMetadata} />
        </div>
-        <div className="h-8" />
-        <div className="pb-10">{props.children}</div>
+      </div>
+
+      <SidebarLayout sidebarLinks={sidebarLinks}>
+        {props.children}
+        <div className="h-20" />
      </SidebarLayout>
    </ChakraProviderSetup>
  );
@@ -66,7 +66,7 @@ export const MetadataHeader: React.FC<MetadataHeaderProps> = ({
        </div>
      )}

-      <div className="flex grow flex-col gap-4">
+      <div className="flex grow flex-col gap-3">
        {/* Title */}
        {!data ? (
          <h1 className="font-semibold text-2xl tracking-tight lg:text-3xl">
@@ -75,7 +75,7 @@ export const MetadataHeader: React.FC<MetadataHeaderProps> = ({
        ) : (
          <div className="flex flex-col gap-3 lg:flex-row lg:items-center">
            {data?.name && (
-              <h1 className="line-clamp-2 font-semibold text-2xl tracking-tight lg:text-3xl">
+              <h1 className="line-clamp-2 font-bold text-2xl tracking-tight lg:text-3xl">
                {data.name}
              </h1>
            )}
@@ -89,7 +89,7 @@ function AddToProjectButton(props: {
  return (
    <Dialog>
      <DialogTrigger asChild>
-        <Button className="gap-2" variant="outline">
+        <Button className="gap-2 bg-card" variant="outline">
          <PlusIcon className="size-4" />
          Add To Project
        </Button>
@@ -21,7 +21,7 @@ import {
 } from "./detectedFeatures/permissions";
 import { supportedERCs } from "./detectedFeatures/supportedERCs";
 import { type EmbedTypeToShow, getEmbedTypeToShow } from "./getEmbedTypeToShow";
-import { isAnalyticsSupportedForChain } from "./isAnalyticsSupportedForChain";
+import { isInsightSupportedForChain } from "./isAnalyticsSupportedForChain";

 export type ContractPageMetadata = {
  supportedERCs: {
@@ -36,7 +36,7 @@ export type ContractPageMetadata = {
  isPermissionsEnumerableSupported: boolean;
  isModularCore: boolean;
  embedType: EmbedTypeToShow;
-  isAnalyticsSupported: boolean;
+  isInsightSupported: boolean;
  isSplitSupported: boolean;
  isERC721ClaimConditionsSupported: boolean;
  isERC20ClaimConditionsSupported: boolean;
@@ -47,7 +47,7 @@ export type ContractPageMetadata = {
 };

 export async function getContractPageMetadata(contract: ThirdwebContract) {
-  return getContractPageMetadataSetup(contract, isAnalyticsSupportedForChain);
+  return getContractPageMetadataSetup(contract, isInsightSupportedForChain);
 }

 export async function getContractPageMetadataSetup(
@@ -56,7 +56,7 @@ export async function getContractPageMetadataSetup(
 ): Promise<ContractPageMetadata> {
  const [
    functionSelectorsResult,
-    isAnalyticsSupportedResult,
+    isInsightSupportedResult,
    contractTypeResult,
  ] = await Promise.allSettled([
    resolveFunctionSelectors(contract),
@@ -69,9 +69,9 @@ export async function getContractPageMetadataSetup(
      ? functionSelectorsResult.value
      : [];

-  const isAnalyticsSupported =
-    isAnalyticsSupportedResult.status === "fulfilled"
-      ? isAnalyticsSupportedResult.value
+  const isInsightSupported =
+    isInsightSupportedResult.status === "fulfilled"
+      ? isInsightSupportedResult.value
      : true;

  const contractType =
@@ -86,7 +86,7 @@ export async function getContractPageMetadataSetup(
      isPermissionsEnumerableSupported(functionSelectors),
    isModularCore: isModularCoreContract(functionSelectors),
    embedType: getEmbedTypeToShow(functionSelectors),
-    isAnalyticsSupported: isAnalyticsSupported,
+    isInsightSupported: isInsightSupported,
    isSplitSupported: contractType === "Split",
    isVoteContract: contractType === "VoteERC20",
    isERC721ClaimConditionsSupported:
@@ -47,7 +47,7 @@ export function getContractPageSidebarLinks(data: {
    {
      label: "Analytics",
      href: `${layoutPrefix}/analytics`,
-      hide: !data.metadata.isAnalyticsSupported,
+      hide: !data.metadata.isInsightSupported,
      exactMatch: true,
    },
    {
@@ -4,7 +4,7 @@ import { getVercelEnv } from "lib/vercel-utils";
 const thirdwebDomain =
  getVercelEnv() !== "production" ? "thirdweb-dev" : "thirdweb";

-export async function isAnalyticsSupportedForChain(
+export async function isInsightSupportedForChain(
  chainId: number,
 ): Promise<boolean> {
  try {
@@ -32,6 +32,7 @@ export function AccountPageClient(props: {
      contract={props.contract}
      chainMetadata={props.chainMetadata}
      twAccount={props.twAccount}
+      isInsightSupported={metadataQuery.data.isInsightSupported}
    />
  );
 }
@@ -12,12 +12,14 @@ interface AccountPageProps {
  contract: ThirdwebContract;
  chainMetadata: ChainMetadata;
  twAccount: Account | undefined;
+  isInsightSupported: boolean;
 }

 export const AccountPage: React.FC<AccountPageProps> = ({
  contract,
  chainMetadata,
  twAccount,
+  isInsightSupported,
 }) => {
  const symbol = chainMetadata.nativeCurrency.symbol || "Native Token";

@@ -43,7 +45,7 @@ export const AccountPage: React.FC<AccountPageProps> = ({
      <div className="flex flex-row items-center justify-between">
        <Heading size="title.sm">NFTs owned</Heading>
      </div>
-      <NftsOwned contract={contract} />
+      <NftsOwned contract={contract} isInsightSupported={isInsightSupported} />
    </div>
  );
 };
@@ -6,12 +6,17 @@ import { NFTCards } from "../../_components/NFTCards";

 interface NftsOwnedProps {
  contract: ThirdwebContract;
+  isInsightSupported: boolean;
 }

-export const NftsOwned: React.FC<NftsOwnedProps> = ({ contract }) => {
+export const NftsOwned: React.FC<NftsOwnedProps> = ({
+  contract,
+  isInsightSupported,
+}) => {
  const { data: walletNFTs, isPending: isWalletNFTsLoading } = useWalletNFTs({
    chainId: contract.chain.id,
    walletAddress: contract.address,
+    isInsightSupported: isInsightSupported,
  });

  const nfts = walletNFTs?.result || [];
@@ -33,7 +33,8 @@ export default async function Page(props: {
    );
  }

-  const { isAccount } = await getContractPageMetadata(contract);
+  const { isAccount, isInsightSupported } =
+    await getContractPageMetadata(contract);

  if (!isAccount) {
    redirect(`/${params.chain_id}/${params.contractAddress}`);
@@ -44,6 +45,7 @@ export default async function Page(props: {
      contract={contract}
      chainMetadata={chainMetadata}
      twAccount={account}
+      isInsightSupported={isInsightSupported}
    />
  );
 }
@@ -21,7 +21,7 @@ export function ContractAnalyticsPageClient(props: {
    return <ErrorPage />;
  }

-  if (!metadataQuery.data.isAnalyticsSupported) {
+  if (!metadataQuery.data.isInsightSupported) {
    return <RedirectToContractOverview contract={props.contract} />;
  }

@@ -1,6 +1,6 @@
 "use client";
 import { ThirdwebBarChart } from "@/components/blocks/charts/bar-chart";
-import { Skeleton, Stat, StatLabel, StatNumber } from "@chakra-ui/react";
+import { SkeletonContainer } from "@/components/ui/skeleton";
 import type { UseQueryResult } from "@tanstack/react-query";
 import {
  type AnalyticsQueryParams,
@@ -14,9 +14,9 @@ import {
  useTotalContractTransactionAnalytics,
  useTotalContractUniqueWallets,
 } from "data/analytics/hooks";
-import { Suspense, useMemo, useState } from "react";
+import { formatDate } from "date-fns";
+import { useMemo, useState } from "react";
 import type { ThirdwebContract } from "thirdweb";
-import { Card } from "tw-components";
 import {
  DateRangeSelector,
  type Range,
@@ -121,6 +121,15 @@ type ChartProps = {
  startDate: Date;
  endDate: Date;
 };
+
+function toolTipLabelFormatter(_v: string, item: unknown) {
+  if (Array.isArray(item)) {
+    const time = item[0].payload.time as number;
+    return formatDate(new Date(time), "MMM d, yyyy");
+  }
+  return undefined;
+}
+
 function UniqueWalletsChart(props: ChartProps) {
  const analyticsQuery = useContractUniqueWalletAnalytics(props);

@@ -128,6 +137,7 @@ function UniqueWalletsChart(props: ChartProps) {
    <ThirdwebBarChart
      header={{
        title: "Unique Wallets",
+        titleClassName: "mb-0.5 text-xl",
        description:
          "The number of unique wallet addresses that have sent a transaction to this contract.",
      }}
@@ -140,6 +150,8 @@ function UniqueWalletsChart(props: ChartProps) {
        },
      }}
      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
+      hideLabel={false}
+      toolTipLabelFormatter={toolTipLabelFormatter}
    />
  );
 }
@@ -156,6 +168,7 @@ function TotalTransactionsChart(props: ChartProps) {
    <ThirdwebBarChart
      header={{
        title: "Total Transactions",
+        titleClassName: "mb-0.5 text-xl",
        description:
          "The number of transactions that have been sent to this contract.",
      }}
@@ -168,6 +181,8 @@ function TotalTransactionsChart(props: ChartProps) {
        },
      }}
      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
+      hideLabel={false}
+      toolTipLabelFormatter={toolTipLabelFormatter}
    />
  );
 }
@@ -179,6 +194,7 @@ function TotalEventsChart(props: ChartProps) {
    <ThirdwebBarChart
      header={{
        title: "Total Events",
+        titleClassName: "mb-0.5 text-xl",
        description:
          "The number of on-chain events that have been emitted from this contract.",
      }}
@@ -191,6 +207,8 @@ function TotalEventsChart(props: ChartProps) {
        },
      }}
      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
+      hideLabel={false}
+      toolTipLabelFormatter={toolTipLabelFormatter}
    />
  );
 }
@@ -227,6 +245,7 @@ function FunctionBreakdownChart(
    <ThirdwebBarChart
      header={{
        title: "Function Breakdown",
+        titleClassName: "mb-0.5 text-xl",
        description:
          "The breakdown of calls to each write function from transactions.",
      }}
@@ -247,6 +266,8 @@ function FunctionBreakdownChart(
      )}
      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
      showLegend
+      hideLabel={false}
+      toolTipLabelFormatter={toolTipLabelFormatter}
    />
  );
 }
@@ -283,6 +304,7 @@ function EventBreakdownChart(
    <ThirdwebBarChart
      header={{
        title: "Event Breakdown",
+        titleClassName: "mb-0.5 text-xl",
        description: "The breakdown of events emitted by this contract.",
      }}
      data={mappedQueryData || []}
@@ -302,6 +324,8 @@ function EventBreakdownChart(
      )}
      chartClassName="aspect-[1.5] lg:aspect-[4.5]"
      showLegend
+      hideLabel={false}
+      toolTipLabelFormatter={toolTipLabelFormatter}
    />
  );
 }
@@ -320,25 +344,12 @@ const AnalyticsStat: React.FC<AnalyticsStatProps> = ({
  useTotal,
 }) => {
  return (
-    <Suspense fallback={<AnalyticsSkeleton label={label} />}>
-      <AnalyticsData
-        chainId={chainId}
-        contractAddress={contractAddress}
-        useTotal={useTotal}
-        label={label}
-      />
-    </Suspense>
-  );
-};
-
-const AnalyticsSkeleton: React.FC<{ label: string }> = ({ label }) => {
-  return (
-    <Card as={Stat} className="bg-card">
-      <StatLabel mb={{ base: 1, md: 0 }}>{label}</StatLabel>
-      <Skeleton isLoaded={false}>
-        <StatNumber>{0}</StatNumber>
-      </Skeleton>
-    </Card>
+    <AnalyticsData
+      chainId={chainId}
+      contractAddress={contractAddress}
+      useTotal={useTotal}
+      label={label}
+    />
  );
 };

@@ -355,20 +366,23 @@ const AnalyticsData: React.FC<AnalyticsStatProps> = ({
    chainId,
  });

-  const data = useMemo(() => {
-    if (!totalQuery.data) {
-      return 0;
-    }
-
-    return totalQuery.data.count;
-  }, [totalQuery.data]);
-
-  return (
-    <Card as={Stat} className="bg-card">
-      <StatLabel mb={{ base: 1, md: 0 }}>{label}</StatLabel>
-      <Skeleton isLoaded={totalQuery.isFetched}>
-        <StatNumber>{data.toLocaleString()}</StatNumber>
-      </Skeleton>
-    </Card>
-  );
+  return <AnalyticsStatUI label={label} data={totalQuery.data?.count} />;
 };
+
+function AnalyticsStatUI(props: {
+  label: string;
+  data: number | undefined;
+}) {
+  return (
+    <dl className="rounded-lg border bg-card p-4">
+      <dt className="font-semibold">{props.label}</dt>
+      <SkeletonContainer
+        skeletonData={10000}
+        loadedData={props.data}
+        render={(v) => {
+          return <dd className="font-normal text-xl">{v.toLocaleString()}</dd>;
+        }}
+      />
+    </dl>
+  );
+}
@@ -34,9 +34,9 @@ export default async function Page(props: {
    );
  }

-  const { isAnalyticsSupported } = await getContractPageMetadata(info.contract);
+  const { isInsightSupported } = await getContractPageMetadata(info.contract);

-  if (!isAnalyticsSupported) {
+  if (!isInsightSupported) {
    redirect(`/${params.chain_id}/${params.contractAddress}`);
  }

@@ -36,6 +36,7 @@ export function ClaimConditionsClient(props: {
      contract={props.contract}
      isERC20={supportedERCs.isERC20}
      twAccount={props.twAccount}
+      isMultiphase={true}
    />
  );
 }
@@ -41,6 +41,7 @@ export default async function Page(props: {
      contract={contract}
      isERC20={supportedERCs.isERC20}
      twAccount={account}
+      isMultiphase={true}
    />
  );
 }
@@ -3,14 +3,11 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
-import { Toaster, toast } from "sonner";
-import { BadgeContainer, mobileViewport } from "stories/utils";
+import { toast } from "sonner";
+import { BadgeContainer } from "stories/utils";
 import { ZERO_ADDRESS } from "thirdweb";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
-import {
-  ErrorProvider,
-  type TransactionError,
-} from "../../../../../../../contexts/error-handler";
+import type { TransactionError } from "../../../../../../../contexts/error-handler";
 import { accountStub } from "../../../../../../../stories/stubs";
 import {
  BatchMetadataModuleUI,
@@ -21,7 +18,6 @@ const meta = {
  title: "Modules/BatchMetadata",
  component: Component,
  parameters: {
-    layout: "centered",
    nextjs: {
      appDirectory: true,
    },
@@ -31,17 +27,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Component() {
  const [isOwner, setIsOwner] = useState(true);

@@ -80,38 +69,35 @@ function Component() {

  return (
    <ThirdwebProvider>
-      <ErrorProvider>
-        <div className="container flex max-w-[1150px] flex-col gap-10 py-10">
-          <div>
-            <ConnectButton client={getThirdwebClient()} />
-          </div>
-
-          <div className="flex items-center gap-5">
-            <CheckboxWithLabel
-              value={isOwner}
-              onChange={setIsOwner}
-              id="isOwner"
-              label="Is Owner"
-            />
-          </div>
-
-          <BadgeContainer label="Default">
-            <BatchMetadataModuleUI
-              twAccount={accountStub()}
-              contractInfo={contractInfo}
-              moduleAddress="0x0000000000000000000000000000000000000000"
-              uploadMetadata={uploadMetadataStub}
-              uninstallButton={{
-                onClick: async () => removeMutation.mutateAsync(),
-                isPending: removeMutation.isPending,
-              }}
-              isOwnerAccount={isOwner}
-              contractChainId={1}
-            />
-          </BadgeContainer>
-          <Toaster richColors />
+      <div className="container flex max-w-6xl flex-col gap-10 py-10">
+        <div>
+          <ConnectButton client={getThirdwebClient()} />
        </div>
-      </ErrorProvider>
+
+        <div className="flex items-center gap-5">
+          <CheckboxWithLabel
+            value={isOwner}
+            onChange={setIsOwner}
+            id="isOwner"
+            label="Is Owner"
+          />
+        </div>
+
+        <BadgeContainer label="Default">
+          <BatchMetadataModuleUI
+            twAccount={accountStub()}
+            contractInfo={contractInfo}
+            moduleAddress="0x0000000000000000000000000000000000000000"
+            uploadMetadata={uploadMetadataStub}
+            uninstallButton={{
+              onClick: async () => removeMutation.mutateAsync(),
+              isPending: removeMutation.isPending,
+            }}
+            isOwnerAccount={isOwner}
+            contractChainId={1}
+          />
+        </BadgeContainer>
+      </div>
    </ThirdwebProvider>
  );
 }
@@ -11,8 +11,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { subDays } from "date-fns";
 import { useState } from "react";
-import { Toaster, toast } from "sonner";
-import { mobileViewport } from "stories/utils";
+import { toast } from "sonner";
 import { NATIVE_TOKEN_ADDRESS, ZERO_ADDRESS } from "thirdweb";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { checksumAddress } from "thirdweb/utils";
@@ -29,7 +28,6 @@ const meta = {
  title: "Modules/Claimable",
  component: Component,
  parameters: {
-    layout: "centered",
    nextjs: {
      appDirectory: true,
    },
@@ -39,17 +37,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 const testAddress1 = "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37";

 const claimCondition = {
@@ -67,7 +58,7 @@ const claimCondition = {

 function Component() {
  const [isOwner, setIsOwner] = useState(true);
-  const [name, setName] = useState("ClaimableERC721");
+  const [name, setName] = useState("MintableERC721");
  const [isClaimConditionLoading, setIsClaimConditionLoading] = useState(false);
  const [isPrimarySaleRecipientLoading, setIsPrimarySaleRecipientLoading] =
    useState(false);
@@ -110,7 +101,7 @@ function Component() {

  return (
    <ThirdwebProvider>
-      <div className="container flex max-w-[1150px] flex-col gap-10 py-10">
+      <div className="container flex max-w-6xl flex-col gap-10 py-10">
        <div>
          <ConnectButton client={getThirdwebClient()} />
        </div>
@@ -196,8 +187,6 @@ function Component() {
          isValidTokenId={true}
          noClaimConditionSet={noClaimConditionSet}
        />
-
-        <Toaster richColors />
      </div>
    </ThirdwebProvider>
  );
@@ -11,8 +11,8 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
-import { Toaster, toast } from "sonner";
-import { BadgeContainer, mobileViewport } from "stories/utils";
+import { toast } from "sonner";
+import { BadgeContainer } from "stories/utils";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { accountStub } from "../../../../../../../stories/stubs";
 import {
@@ -25,7 +25,6 @@ const meta = {
  title: "Modules/Mintable",
  component: Component,
  parameters: {
-    layout: "centered",
    nextjs: {
      appDirectory: true,
    },
@@ -35,17 +34,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 const testAddress1 = "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37";

 function Component() {
@@ -84,7 +76,7 @@ function Component() {

  return (
    <ThirdwebProvider>
-      <div className="container flex max-w-[1150px] flex-col gap-10 py-10">
+      <div className="container flex max-w-6xl flex-col gap-10 py-10">
        <div>
          <ConnectButton client={getThirdwebClient()} />
        </div>
@@ -175,8 +167,6 @@ function Component() {
            contractChainId={1}
          />
        </BadgeContainer>
-
-        <Toaster richColors />
      </div>
    </ThirdwebProvider>
  );
@@ -2,33 +2,22 @@ import { Checkbox } from "@/components/ui/checkbox";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
-import { Toaster } from "sonner";
-import { BadgeContainer, mobileViewport } from "stories/utils";
+import { BadgeContainer } from "stories/utils";
 import { ThirdwebProvider } from "thirdweb/react";
 import { ModuleCardUI } from "./module-card";

 const meta = {
  title: "Modules/ModuleCard",
  component: Component,
-  parameters: {
-    layout: "centered",
-  },
 } satisfies Meta<typeof Component>;

 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Component() {
  const [isOwner, setIsOwner] = useState(true);

@@ -120,8 +109,6 @@ function Component() {
            </div>
          </ModuleCardUI>
        </BadgeContainer>
-
-        <Toaster richColors />
      </div>
    </ThirdwebProvider>
  );
@@ -3,8 +3,8 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
-import { Toaster, toast } from "sonner";
-import { BadgeContainer, mobileViewport } from "stories/utils";
+import { toast } from "sonner";
+import { BadgeContainer } from "stories/utils";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { accountStub } from "../../../../../../../stories/stubs";
 import {
@@ -16,7 +16,6 @@ const meta = {
  title: "Modules/OpenEditionMetadata",
  component: Component,
  parameters: {
-    layout: "centered",
    nextjs: {
      appDirectory: true,
    },
@@ -26,17 +25,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 function Component() {
  const [isOwner, setIsOwner] = useState(true);
  async function setSharedMetadataStub(values: SetSharedMetadataFormValues) {
@@ -98,8 +90,6 @@ function Component() {
            twAccount={accountStub()}
          />
        </BadgeContainer>
-
-        <Toaster richColors />
      </div>
    </ThirdwebProvider>
  );
@@ -3,8 +3,8 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
-import { Toaster, toast } from "sonner";
-import { BadgeContainer, mobileViewport } from "stories/utils";
+import { toast } from "sonner";
+import { BadgeContainer } from "stories/utils";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { accountStub } from "../../../../../../../stories/stubs";
 import {
@@ -18,7 +18,6 @@ const meta = {
  title: "Modules/Royalty",
  component: Component,
  parameters: {
-    layout: "centered",
    nextjs: {
      appDirectory: true,
    },
@@ -28,17 +27,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 const _testAddress1 = "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37";

 function Component() {
@@ -79,7 +71,7 @@ function Component() {

  return (
    <ThirdwebProvider>
-      <div className="container flex max-w-[1150px] flex-col gap-10 py-10">
+      <div className="container flex max-w-6xl flex-col gap-10 py-10">
        <div>
          <ConnectButton client={getThirdwebClient()} />
        </div>
@@ -168,8 +160,6 @@ function Component() {
            twAccount={twAccount}
          />
        </BadgeContainer>
-
-        <Toaster richColors />
      </div>
    </ThirdwebProvider>
  );
@@ -3,8 +3,8 @@ import { getThirdwebClient } from "@/constants/thirdweb.server";
 import type { Meta, StoryObj } from "@storybook/react";
 import { useMutation } from "@tanstack/react-query";
 import { useState } from "react";
-import { Toaster, toast } from "sonner";
-import { BadgeContainer, mobileViewport } from "stories/utils";
+import { toast } from "sonner";
+import { BadgeContainer } from "stories/utils";
 import { ConnectButton, ThirdwebProvider } from "thirdweb/react";
 import { accountStub } from "../../../../../../../stories/stubs";
 import {
@@ -16,7 +16,6 @@ const meta = {
  title: "Modules/Transferable",
  component: Component,
  parameters: {
-    layout: "centered",
    nextjs: {
      appDirectory: true,
    },
@@ -26,17 +25,10 @@ const meta = {
 export default meta;
 type Story = StoryObj<typeof meta>;

-export const Desktop: Story = {
+export const Variants: Story = {
  args: {},
 };

-export const Mobile: Story = {
-  args: {},
-  parameters: {
-    viewport: mobileViewport("iphone14"),
-  },
-};
-
 const testAddress1 = "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37";

 function Component() {
@@ -65,7 +57,7 @@ function Component() {

  return (
    <ThirdwebProvider>
-      <div className="container flex max-w-[1150px] flex-col gap-10 py-10">
+      <div className="container flex max-w-6xl flex-col gap-10 py-10">
        <div className="flex gap-2">
          <Checkbox
            id="terms1"
@@ -139,8 +131,6 @@ function Component() {
            twAccount={accountStub()}
          />
        </BadgeContainer>
-
-        <Toaster richColors />
      </div>
    </ThirdwebProvider>
  );
@@ -60,7 +60,7 @@ export const ContractNFTPage: React.FC<NftOverviewPageProps> = ({
  return (
    <div className="flex flex-col gap-6">
      <div className="flex flex-col gap-3 xl:flex-row xl:items-center xl:justify-between">
-        <h2 className="font-semibold text-2xl tracking-tight">Contract NFTs</h2>
+        <h2 className="font-semibold text-2xl tracking-tight">NFTs</h2>
        <div className="grid grid-cols-2 gap-2 md:flex">
          {isRevealable && (
            <NFTRevealButton contract={contract} twAccount={twAccount} />
@@ -4,33 +4,31 @@ import { UnexpectedValueErrorMessage } from "@/components/blocks/error-fallbacks
 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Badge } from "@/components/ui/badge";
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbSeparator,
+} from "@/components/ui/breadcrumb";
+import { Button } from "@/components/ui/button";
 import { CodeClient } from "@/components/ui/code/code.client";
+import { TabButtons } from "@/components/ui/tabs";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 import { useThirdwebClient } from "@/constants/thirdweb.client";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
 import type { Account } from "@3rdweb-sdk/react/hooks/useApi";
-import {
-  Box,
-  ButtonGroup,
-  Divider,
-  Flex,
-  GridItem,
-  IconButton,
-  SimpleGrid,
-  Tooltip,
-  useBreakpointValue,
-} from "@chakra-ui/react";
 import { useChainSlug } from "hooks/chains/chainSlug";
-import { ChevronLeftIcon, ExternalLinkIcon } from "lucide-react";
+import { ExternalLinkIcon } from "lucide-react";
 import Link from "next/link";
 import { useState } from "react";
-import type { ThirdwebContract } from "thirdweb";
+import type { NFT, ThirdwebClient, ThirdwebContract } from "thirdweb";
 import { getNFT as getErc721NFT } from "thirdweb/extensions/erc721";
 import { getNFT as getErc1155NFT } from "thirdweb/extensions/erc1155";
 import { useReadContract } from "thirdweb/react";
-import { Button, Card } from "tw-components";
 import { NFTMediaWithEmptyState } from "tw-components/nft-media";
-import { shortenString } from "utils/usedapp-external";
 import { NftProperty } from "../components/nft-property";
 import { useNFTDrawerTabs } from "./useNftDrawerTabs";

@@ -66,7 +64,6 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
  twAccount,
 }) => {
  const [tab, setTab] = useState("Details");
-  const isMobile = useBreakpointValue({ base: true, md: false });
  const router = useDashboardRouter();
  const chainId = contract.chain.id;
  const chainSlug = useChainSlug(chainId || 1);
@@ -89,15 +86,6 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
    },
  );

-  const tokenURIHttpLink = resolveSchemeWithErrorHandler({
-    client,
-    uri: nft?.tokenURI,
-  });
-  const nftImageLink = resolveSchemeWithErrorHandler({
-    client,
-    uri: nft?.metadata.image,
-  });
-
  if (isPending) {
    return (
      <div className="flex h-[400px] items-center justify-center">
@@ -123,230 +111,218 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
      : undefined,
  };

+  return (
+    <div>
+      <div className="flex flex-col gap-6 lg:flex-row">
+        <div className="relative aspect-square w-full shrink-0 self-start overflow-hidden bg-card lg:w-[350px]">
+          {/* border */}
+          <div className="absolute inset-0 z-0 rounded-lg border" />
+          {/* media */}
+          <NFTMediaWithEmptyState metadata={nftMetadata} className="z-10" />
+        </div>
+
+        <div className="flex w-full flex-col gap-6">
+          {/* breadcrumb + title */}
+          <div>
+            <Breadcrumb className="mb-3">
+              <BreadcrumbList>
+                <BreadcrumbItem>
+                  <BreadcrumbLink
+                    href={`/${chainSlug}/${contract.address}/nfts`}
+                    onClick={(e) => {
+                      e.preventDefault();
+                      router.push(`/${chainSlug}/${contract.address}/nfts`);
+                    }}
+                  >
+                    NFTs
+                  </BreadcrumbLink>
+                </BreadcrumbItem>
+                <BreadcrumbSeparator />
+                <BreadcrumbItem>
+                  <BreadcrumbLink>#{tokenId}</BreadcrumbLink>
+                </BreadcrumbItem>
+              </BreadcrumbList>
+            </Breadcrumb>
+
+            <div className="flex flex-col gap-1.5">
+              <NFTName value={nft.metadata.name} />
+              {nft.metadata?.description && (
+                <NFTDescription value={nft.metadata.description} />
+              )}
+            </div>
+          </div>
+
+          <TabButtons
+            tabClassName="!text-sm"
+            tabs={[
+              {
+                name: "Details",
+                onClick: () => setTab("Details"),
+                isActive: tab === "Details",
+                isDisabled: false,
+              },
+              ...tabs.map((tb) => ({
+                name: tb.title,
+                onClick: () => setTab(tb.title),
+                isActive: tab === tb.title,
+                isDisabled: tb.isDisabled,
+                toolTip: tb.isDisabled ? tb.disabledText : undefined,
+              })),
+            ].sort((a, b) => (a.isDisabled ? 1 : b.isDisabled ? -1 : 0))}
+          />
+
+          {/* tab contents */}
+          {tab === "Details" && <NFTDetailsTab nft={nft} client={client} />}
+
+          {tabs.map((tb) => {
+            return (
+              tb.title === tab && (
+                <div key={tb.title} className="w-full">
+                  {tb.children}
+                </div>
+              )
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+};
+
+function NFTDetailsTab(props: {
+  nft: NFT;
+  client: ThirdwebClient;
+}) {
+  const { nft, client } = props;
  const properties = nft.metadata.attributes || nft.metadata.properties;

  return (
-    <Flex flexDir={{ base: "column", lg: "row" }} gap={6}>
-      <Card h="full" position="relative" minH="100px">
-        <Box w="50px" position="absolute" zIndex={1000} top={6} left={6}>
-          {/* TODO - replace this with breadcrumbs  */}
-          <Card p={1} bgColor="backgroundCardHighlight">
-            <IconButton
-              w="inherit"
-              variant="ghost"
-              onClick={() =>
-                router.push(`/${chainSlug}/${contract.address}/nfts`)
+    <div className="flex flex-col gap-8">
+      {/* common */}
+      <div className="flex flex-col gap-3">
+        <div className="grid grid-cols-1 items-center gap-x-8 gap-y-4 lg:grid-cols-[1fr_2fr]">
+          {/* token id */}
+          <div>
+            <p className="mb-1 text-muted-foreground text-sm">Token ID</p>
+            <CopyTextButton
+              textToCopy={nft.id?.toString()}
+              textToShow={
+                nft.id?.toString().length > 8
+                  ? `${nft.id.toString().slice(0, 4)}...${nft.id.toString().slice(-4)}`
+                  : nft.id?.toString()
              }
-              aria-label="Back"
-              icon={<ChevronLeftIcon className="size-6" />}
-            >
-              Back
-            </IconButton>
-          </Card>
-        </Box>
-        <NFTMediaWithEmptyState
-          metadata={nftMetadata}
-          width={isMobile ? "100%" : "300px"}
-          height={isMobile ? "100%" : "300px"}
-        />
-      </Card>
-      <Flex flexDir="column" gap={6} w="full" px={2}>
-        <Flex flexDir="column" gap={1.5}>
-          <NFTName value={nft.metadata.name} />
-          {nft.metadata?.description && (
-            <NFTDescription value={nft.metadata.description} />
+              tooltip="Token ID"
+              copyIconPosition="right"
+              className="min-w-16 justify-between bg-card"
+            />
+          </div>
+
+          {/* owner */}
+          {nft.owner && (
+            <div>
+              <p className="mb-1 text-muted-foreground text-sm">Owner</p>
+              <WalletAddress
+                address={nft.owner}
+                className="h-auto rounded-full border bg-card px-2 py-1 pr-4 text-foreground text-sm"
+              />
+            </div>
          )}
-        </Flex>

-        <Flex flexDir="column" gap={{ base: 0, md: 4 }}>
-          <Box
-            w="full"
-            overflow={{ base: "auto", md: "hidden" }}
-            pb={{ base: 4, md: 0 }}
-          >
-            <ButtonGroup size="sm" variant="ghost" spacing={2}>
-              <Button
-                type="button"
-                isActive={tab === "Details"}
-                _active={{
-                  bg: "bgBlack",
-                  color: "bgWhite",
-                }}
-                rounded="lg"
-                onClick={() => setTab("Details")}
+          {/* type */}
+          <div>
+            <p className="mb-1 text-muted-foreground text-sm">Token Standard</p>
+            <Badge
+              variant="outline"
+              className="bg-card py-1 font-normal text-sm"
+            >
+              {nft.type}
+            </Badge>
+          </div>
+
+          {/* supply */}
+          {nft.type !== "ERC721" && (
+            <div className="w-full">
+              <p className="mb-1 text-muted-foreground text-sm">Supply</p>
+              <ToolTipLabel
+                label={nft.supply.toLocaleString("en-US")}
+                contentClassName="text-sm break-all"
              >
-                Details
-              </Button>
-              {tabs.map((tb) => (
-                <Tooltip
-                  key={tb.title}
-                  p={0}
-                  bg="transparent"
-                  boxShadow="none"
-                  label={
-                    tb.isDisabled ? (
-                      <Card py={2} px={4} bgColor="backgroundHighlight">
-                        <p>{tb.disabledText}</p>
-                      </Card>
-                    ) : (
-                      ""
-                    )
-                  }
-                >
-                  <Button
-                    isDisabled={tb.isDisabled}
-                    type="button"
-                    isActive={tab === tb.title}
-                    _active={{
-                      bg: "bgBlack",
-                      color: "bgWhite",
-                    }}
-                    rounded="lg"
-                    onClick={() => setTab(tb.title)}
-                  >
-                    {tb.title}
-                  </Button>
-                </Tooltip>
-              ))}
-            </ButtonGroup>
-          </Box>
-          <Divider />
-        </Flex>
+                <p className="max-w-[200px] truncate text-sm">
+                  {nft.supply.toLocaleString("en-US")}
+                </p>
+              </ToolTipLabel>
+            </div>
+          )}

-        {tab === "Details" && (
-          <Flex flexDir="column" gap={4}>
-            <Card as={Flex} flexDir="column" gap={3}>
-              <SimpleGrid rowGap={3} columns={12} placeItems="center left">
-                <GridItem colSpan={4}>
-                  <p className="font-semibold">Token ID</p>
-                </GridItem>
-                <GridItem colSpan={8}>
-                  <CopyTextButton
-                    textToCopy={nft.id?.toString()}
-                    textToShow={
-                      nft.id?.toString().length > 8
-                        ? `${nft.id.toString().slice(0, 4)}...${nft.id.toString().slice(-4)}`
-                        : nft.id?.toString()
-                    }
-                    tooltip="Token ID"
-                    copyIconPosition="right"
-                  />
-                </GridItem>
+          {/* token uri */}
+          <div>
+            <p className="mb-1 text-muted-foreground text-sm">Token URI</p>
+            <IPFSLinkGroup
+              ipfsLink={nft.tokenURI}
+              tooltip="The URI of this NFT"
+              client={client}
+              httpsLinkTooltip="View URI"
+            />
+          </div>

-                {nft.owner && (
-                  <>
-                    <GridItem colSpan={4}>
-                      <p className="font-semibold">Owner</p>
-                    </GridItem>
-                    <GridItem colSpan={8}>
-                      <WalletAddress address={nft.owner} />
-                    </GridItem>
-                  </>
-                )}
-                <GridItem colSpan={4}>
-                  <p className="font-semibold">Token Standard</p>
-                </GridItem>
-                <GridItem colSpan={8}>{nft.type}</GridItem>
-                {nft.type !== "ERC721" && (
-                  <>
-                    <GridItem colSpan={4}>
-                      <p className="font-semibold">Supply</p>
-                    </GridItem>
-                    <GridItem colSpan={8}>
-                      <p>{nft.supply.toLocaleString("en-US")}</p>
-                    </GridItem>
-                  </>
-                )}
-                <GridItem colSpan={4}>
-                  <p className="font-semibold">Token URI</p>
-                </GridItem>
-                <GridItem
-                  colSpan={8}
-                  className="flex flex-row items-center gap-1"
-                >
-                  <CopyTextButton
-                    textToCopy={nft.tokenURI}
-                    textToShow={shortenString(nft.tokenURI)}
-                    tooltip="The URI of this NFT"
-                    copyIconPosition="right"
-                  />
-                  {tokenURIHttpLink && (
-                    <Button variant="ghost" size="sm">
-                      <Link href={tokenURIHttpLink} target="_blank">
-                        <ExternalLinkIcon className="size-4" />
-                      </Link>
-                    </Button>
-                  )}
-                </GridItem>
-                {nft.metadata.image && (
-                  <>
-                    <GridItem colSpan={4}>
-                      <p className="font-semibold">Media URI</p>
-                    </GridItem>
-                    <GridItem
-                      colSpan={8}
-                      className="flex flex-row items-center gap-1"
-                    >
-                      <CopyTextButton
-                        textToCopy={nft.metadata.image}
-                        textToShow={shortenString(nft.metadata.image)}
-                        tooltip="The media URI of this NFT"
-                        copyIconPosition="right"
-                      />
-                      {nftImageLink && (
-                        <Button variant="ghost" size="sm">
-                          <Link href={nftImageLink} target="_blank">
-                            <ExternalLinkIcon className="size-4" />
-                          </Link>
-                        </Button>
-                      )}
-                    </GridItem>
-                  </>
-                )}
-              </SimpleGrid>
-            </Card>
-            {properties ? (
-              <Card as={Flex} flexDir="column" gap={4}>
-                <p className="font-semibold">Attributes</p>
-                {Array.isArray(properties) &&
-                String(properties[0]?.value) !== "undefined" ? (
-                  <SimpleGrid columns={{ base: 2, md: 4 }} gap={2}>
-                    {/* biome-ignore lint/suspicious/noExplicitAny: FIXME */}
-                    {properties.map((property: any, idx) => (
-                      // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
-                      <NftProperty key={idx} property={property} />
-                    ))}
-                  </SimpleGrid>
-                ) : (
-                  <CodeClient
-                    code={JSON.stringify(properties, null, 2) || ""}
-                    lang="json"
-                  />
-                )}
-              </Card>
-            ) : null}
-          </Flex>
-        )}
-        {tabs.map((tb) => {
-          return (
-            tb.title === tab && (
-              <Flex key={tb.title} px={0} w="full">
-                {tb.children}
-              </Flex>
-            )
-          );
-        })}
-      </Flex>
-    </Flex>
+          {/* media uri */}
+          {nft.metadata.image && (
+            <div>
+              <p className="mb-1 text-muted-foreground text-sm">Media URI</p>
+              <IPFSLinkGroup
+                ipfsLink={nft.metadata.image}
+                tooltip="The media URI of this NFT"
+                client={client}
+                httpsLinkTooltip="View Media"
+              />
+            </div>
+          )}
+        </div>
+      </div>
+
+      {/* attributes */}
+      {properties ? (
+        <div>
+          <h3 className="mb-2 flex items-center gap-2 font-medium text-base">
+            Attributes
+            {Array.isArray(properties) && properties.length > 0 && (
+              <Badge
+                variant="outline"
+                className="bg-card px-2 text-muted-foreground"
+              >
+                {properties.length}
+              </Badge>
+            )}
+          </h3>
+          <div>
+            {Array.isArray(properties) &&
+            String(properties[0]?.value) !== "undefined" ? (
+              <div className="grid grid-cols-2 gap-3 lg:grid-cols-3">
+                {/* biome-ignore lint/suspicious/noExplicitAny: FIXME */}
+                {properties.map((property: any, idx) => (
+                  // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
+                  <NftProperty key={idx} property={property} />
+                ))}
+              </div>
+            ) : (
+              <CodeClient
+                code={JSON.stringify(properties, null, 2) || ""}
+                lang="json"
+              />
+            )}
+          </div>
+        </div>
+      ) : null}
+    </div>
  );
-};
+}

 function NFTName(props: {
  value: unknown;
 }) {
  if (typeof props.value === "string") {
    return (
-      <h2 className="font-semibold text-lg tracking-tight"> {props.value}</h2>
+      <h2 className="font-bold text-3xl tracking-tight"> {props.value}</h2>
    );
  }

@@ -360,11 +336,49 @@ function NFTName(props: {
  );
 }

+function IPFSLinkGroup(props: {
+  ipfsLink: string;
+  tooltip: string;
+  client: ThirdwebClient;
+  httpsLinkTooltip: string;
+}) {
+  const httpLink = resolveSchemeWithErrorHandler({
+    client: props.client,
+    uri: props.ipfsLink,
+  });
+
+  return (
+    <div className="flex flex-row items-center gap-1.5">
+      <CopyTextButton
+        textToCopy={props.ipfsLink}
+        textToShow={props.ipfsLink}
+        tooltip={props.tooltip}
+        copyIconPosition="right"
+        className="max-w-[200px] truncate bg-card"
+      />
+      {httpLink && (
+        <ToolTipLabel label={props.httpsLinkTooltip}>
+          <Button
+            variant="outline"
+            size="sm"
+            asChild
+            className="size-[34px] rounded-full bg-card p-0 text-muted-foreground"
+          >
+            <Link href={httpLink} target="_blank">
+              <ExternalLinkIcon className="size-3" />
+            </Link>
+          </Button>
+        </ToolTipLabel>
+      )}
+    </div>
+  );
+}
+
 function NFTDescription(props: {
  value: unknown;
 }) {
  if (typeof props.value === "string") {
-    return <p className="text-muted-foreground"> {props.value}</p>;
+    return <p className="text-muted-foreground text-sm"> {props.value}</p>;
  }

  return (
@@ -68,7 +68,6 @@ export function useNFTDrawerTabs({
    const hasERC1155ClaimConditions = (() => {
      return [
        // reads
-        ERC1155Ext.isGetClaimConditionByIdSupported(functionSelectors),
        ERC1155Ext.isGetClaimConditionsSupported(functionSelectors),
        ERC1155Ext.isGetActiveClaimConditionSupported(functionSelectors),
        // writes
@@ -77,6 +76,10 @@ export function useNFTDrawerTabs({
      ].every(Boolean);
    })();

+    const isERC1155Multiphase = (() => {
+      return ERC1155Ext.isGetClaimConditionByIdSupported(functionSelectors);
+    })();
+
    const isBurnable = (() => {
      if (isERC721) {
        return ERC721Ext.isBurnSupported(functionSelectors);
@@ -130,6 +133,7 @@ export function useNFTDrawerTabs({
              tokenId={tokenId}
              isColumn
              twAccount={twAccount}
+              isMultiphase={isERC1155Multiphase}
            />
          ),
        },
@@ -1,5 +1,3 @@
-import { Card } from "@/components/ui/card";
-
 interface NftPropertyProps {
  // biome-ignore lint/suspicious/noExplicitAny: FIXME
  property: any;
@@ -7,17 +5,17 @@ interface NftPropertyProps {

 export const NftProperty: React.FC<NftPropertyProps> = ({ property }) => {
  return (
-    <Card className="flex flex-col gap-2 p-3">
+    <div className="rounded-lg border bg-card p-3 text-sm">
      {property?.trait_type && (
-        <p className="text-center text-link-foreground text-sm leading-[1.2]">
+        <p className="mb-0.5 text-muted-foreground text-sm">
          {property?.trait_type}
        </p>
      )}
-      <p className="text-center text-muted-foreground text-sm">
+      <p className="text-foreground text-sm">
        {typeof property?.value === "object"
          ? JSON.stringify(property?.value || {})
          : property?.value}
      </p>
-    </Card>
+    </div>
  );
 };
@@ -35,7 +35,7 @@ export const SupplyCards: React.FC<SupplyCardsProps> = ({ contract }) => {
  );

  return (
-    <div className="flex flex-row gap-3 md:gap-6 [&>*]:grow">
+    <div className="grid grid-cols-1 gap-4 lg:grid-cols-3">
      <StatCard
        value={realTotalSupply.toString()}
        label="Total Supply"
@@ -1,12 +1,12 @@
 import type { ThirdwebContract } from "thirdweb";
-import { AnalyticsOverview } from "./components/Analytics";
+import { TokenDetailsCard } from "../tokens/components/supply";
+import { ContractAnalyticsOverviewCard } from "./components/Analytics";
 import { BuildYourApp } from "./components/BuildYourApp";
 import { ContractChecklist } from "./components/ContractChecklist";
 import { LatestEvents } from "./components/LatestEvents";
 import { MarketplaceDetails } from "./components/MarketplaceDetails";
 import { NFTDetails } from "./components/NFTDetails";
 import { PermissionsTable } from "./components/PermissionsTable";
-import { TokenDetails } from "./components/TokenDetails";

 interface ContractOverviewPageProps {
  contract: ThirdwebContract;
@@ -38,8 +38,8 @@ export const ContractOverviewPage: React.FC<ContractOverviewPageProps> = ({
  publishedBy,
 }) => {
  return (
-    <div className="flex flex-col gap-8 lg:flex-row">
-      <div className="flex flex-col gap-16">
+    <div className="flex flex-col gap-10 lg:flex-row lg:gap-8">
+      <div className="flex grow flex-col gap-10">
        <ContractChecklist
          isErc721={isErc721}
          isErc1155={isErc1155}
@@ -50,7 +50,7 @@ export const ContractOverviewPage: React.FC<ContractOverviewPageProps> = ({
        />

        {isAnalyticsSupported && (
-          <AnalyticsOverview
+          <ContractAnalyticsOverviewCard
            contractAddress={contract.address}
            chainId={contract.chain.id}
            trackingCategory={TRACKING_CATEGORY}
@@ -77,7 +77,7 @@ export const ContractOverviewPage: React.FC<ContractOverviewPageProps> = ({
          />
        )}

-        {isErc20 && <TokenDetails contract={contract} />}
+        {isErc20 && <TokenDetailsCard contract={contract} />}

        <LatestEvents
          contract={contract}
@@ -12,19 +12,16 @@ import { ArrowRightIcon } from "lucide-react";
 import Link from "next/link";
 import { useMemo, useState } from "react";

-interface AnalyticsOverviewProps {
-  chainId: number;
-  contractAddress: string;
-  trackingCategory: string;
-  chainSlug: string;
+function getDayKey(date: Date) {
+  return date.toISOString().split("T")[0];
 }

-export const AnalyticsOverview: React.FC<AnalyticsOverviewProps> = ({
-  chainId,
-  contractAddress,
-  trackingCategory,
-  chainSlug,
-}) => {
+export function ContractAnalyticsOverviewCard(props: {
+  contractAddress: string;
+  chainId: number;
+  trackingCategory: string;
+  chainSlug: string;
+}) {
  const trackEvent = useTrack();
  const [startDate] = useState(
    (() => {
@@ -35,55 +32,27 @@ export const AnalyticsOverview: React.FC<AnalyticsOverviewProps> = ({
  );
  const [endDate] = useState(new Date());

-  return (
-    <div className="relative">
-      <div className="mb-4 flex items-center justify-between gap-4">
-        <h2 className="font-semibold text-2xl tracking-tight">Analytics</h2>
-        <Button
-          asChild
-          className="gap-1"
-          size="sm"
-          variant="outline"
-          onClick={() => {
-            trackEvent({
-              category: trackingCategory,
-              action: "click",
-              label: "view_all_analytics",
-            });
-          }}
-        >
-          <Link href={`/${chainSlug}/${contractAddress}/analytics`}>
-            <span>View All</span>
-            <ArrowRightIcon className="size-4" />
-          </Link>
-        </Button>
-      </div>
+  const wallets = useContractUniqueWalletAnalytics({
+    chainId: props.chainId,
+    contractAddress: props.contractAddress,
+    startDate,
+    endDate,
+  });

-      <OverviewAnalytics
-        chainId={chainId}
-        contractAddress={contractAddress}
-        endDate={endDate}
-        startDate={startDate}
-      />
-    </div>
-  );
-};
+  const transactions = useContractTransactionAnalytics({
+    chainId: props.chainId,
+    contractAddress: props.contractAddress,
+    startDate,
+    endDate,
+  });

-type ChartProps = {
-  contractAddress: string;
-  chainId: number;
-  startDate: Date;
-  endDate: Date;
-};
+  const events = useContractEventAnalytics({
+    chainId: props.chainId,
+    contractAddress: props.contractAddress,
+    startDate,
+    endDate,
+  });

-function getDayKey(date: Date) {
-  return date.toISOString().split("T")[0];
-}
-
-function OverviewAnalytics(props: ChartProps) {
-  const wallets = useContractUniqueWalletAnalytics(props);
-  const transactions = useContractTransactionAnalytics(props);
-  const events = useContractEventAnalytics(props);
  const isPending =
    wallets.isPending || transactions.isPending || events.isPending;

@@ -135,7 +104,32 @@ function OverviewAnalytics(props: ChartProps) {
      data={mergedData || []}
      isPending={isPending}
      showLegend
-      chartClassName="aspect-[1.5] lg:aspect-[3.5]"
+      chartClassName="aspect-[1.5] lg:aspect-[3]"
+      customHeader={
+        <div className="flex items-center justify-between gap-4 border-b p-6 py-4">
+          <h2 className="font-semibold text-xl tracking-tight">Analytics</h2>
+          <Button
+            asChild
+            className="gap-2 bg-background text-muted-foreground"
+            size="sm"
+            variant="outline"
+            onClick={() => {
+              trackEvent({
+                category: props.trackingCategory,
+                action: "click",
+                label: "view_all_analytics",
+              });
+            }}
+          >
+            <Link
+              href={`/${props.chainSlug}/${props.contractAddress}/analytics`}
+            >
+              <span>View All</span>
+              <ArrowRightIcon className="size-4" />
+            </Link>
+          </Button>
+        </div>
+      }
    />
  );
 }
@@ -1,79 +1,41 @@
-"use client";
+import { TrackedLinkTW } from "@/components/ui/tracked-link";
+import { ReactIcon } from "../../../../../../../components/icons/brand-icons/ReactIcon";
+import { TypeScriptIcon } from "../../../../../../../components/icons/brand-icons/TypeScriptIcon";

-import {
-  Flex,
-  GridItem,
-  LinkBox,
-  LinkOverlay,
-  SimpleGrid,
-} from "@chakra-ui/react";
-import { ChakraNextImage as Image } from "components/Image";
-import { PRODUCTS } from "components/product-pages/common/nav/data";
-import { Card } from "tw-components/card";
-import { TrackedLink, type TrackedLinkProps } from "tw-components/link";
-import { Text } from "tw-components/text";
-
-const RENDERED_PRODUCTS = ["sdk", "storage", "ui-components", "auth"];
-
-interface BuildYourAppProps {
-  trackingCategory: TrackedLinkProps["category"];
+export function BuildYourApp(props: {
+  trackingCategory: string;
  contractAddress: string;
  chainSlug: string;
-}
-
-export const BuildYourApp: React.FC<BuildYourAppProps> = ({
-  trackingCategory,
-  contractAddress,
-  chainSlug,
-}) => {
+}) {
  return (
-    <Card
-      px={{ base: 4, md: 8 }}
-      py={{ base: 6, md: 8 }}
-      as={LinkBox}
-      transition="all 0.2s"
-      _hover={{ borderColor: "whiteAlpha.300" }}
-    >
-      <SimpleGrid {...{ columns: { base: 1, md: 2 } }} gap={8}>
-        <GridItem as={Flex} direction="column" gap={4}>
-          <h2 className="font-semibold text-2xl tracking-tight">
-            Build your app
-          </h2>
-          <Text size="body.md">
-            <LinkOverlay
-              as={TrackedLink}
-              category={trackingCategory}
-              label="build_your_app"
-              href={`/${chainSlug}/${contractAddress}/code`}
-              color="blue.500"
-            >
-              Learn more
-            </LinkOverlay>{" "}
-            about how you can use thirdweb tools to build apps on top of this
-            contract.
-          </Text>
-        </GridItem>
-        <GridItem as={Flex} align="center" justify="end" gap={3}>
-          {RENDERED_PRODUCTS.map((p) => {
-            const product = PRODUCTS.find((item) => item.label === p);
-            return (
-              product?.icon && (
-                <Flex
-                  key={product.name}
-                  rounded="full"
-                  bg="#0E0E10"
-                  align="center"
-                  justify="center"
-                  w={14}
-                  h={14}
-                >
-                  <Image boxSize={7} src={product.icon} alt={product.name} />
-                </Flex>
-              )
-            );
-          })}
-        </GridItem>
-      </SimpleGrid>
-    </Card>
+    <div className="relative flex flex-col justify-between gap-4 rounded-lg border bg-card p-6 hover:border-active-border lg:flex-row">
+      {/* left */}
+      <div className="max-w-sm">
+        <h2 className="mb-2 font-semibold text-xl leading-none tracking-tight">
+          Build your app
+        </h2>
+        <TrackedLinkTW
+          category={props.trackingCategory}
+          label="build_your_app"
+          href={`/${props.chainSlug}/${props.contractAddress}/code`}
+          className="block text-balance text-muted-foreground text-sm before:absolute before:inset-0"
+        >
+          Learn more about how you can use thirdweb tools to build apps on top
+          of this contract
+        </TrackedLinkTW>{" "}
+      </div>
+
+      {/* right */}
+      <div className="flex items-center justify-end gap-3">
+        {[TypeScriptIcon, ReactIcon].map((Icon, i) => {
+          return (
+            // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
+            <div key={i} className="rounded-full border bg-background p-3">
+              <Icon className="size-5 text-muted-foreground" />
+            </div>
+          );
+        })}
+      </div>
+    </div>
  );
-};
+}
@@ -0,0 +1,105 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { LatestEventsUI } from "./LatestEvents";
+
+const meta: Meta<typeof LatestEventsUI> = {
+  title: "Contracts/Overview/LatestEvents",
+  component: LatestEventsUI,
+  decorators: [
+    (Story) => (
+      <div className="container max-w-4xl py-10">
+        <Story />
+      </div>
+    ),
+  ],
+  args: {
+    allEvents: [],
+    autoUpdate: false,
+    eventsHref: "/ethereum/0x123456789/events",
+    trackingCategory: "test-category",
+  },
+};
+
+function eventStub(eventName: string) {
+  return {
+    logIndex: 0,
+    eventName,
+    address: "0x",
+    args: [],
+  };
+}
+
+const txStub =
+  "0x9ef44ea701637e0f7c42666b6f99f4aad9aa6b9b51995cd22df1507288e51427";
+
+export default meta;
+type Story = StoryObj<typeof LatestEventsUI>;
+
+export const Loading: Story = {
+  args: {
+    allEvents: [],
+    autoUpdate: true,
+    eventsHref: "/ethereum/0x123456789/events",
+  },
+};
+
+export const NoEvents: Story = {
+  args: {
+    allEvents: [],
+    autoUpdate: false,
+    eventsHref: "/ethereum/0x123456789/events",
+  },
+};
+
+export const WithEvents: Story = {
+  args: {
+    allEvents: [
+      {
+        transactionHash: txStub,
+        events: [eventStub("Transfer"), eventStub("Approval")],
+      },
+      {
+        transactionHash: txStub,
+        events: [eventStub("Mint")],
+      },
+      {
+        transactionHash: txStub,
+        events: [
+          eventStub("Transfer"),
+          eventStub("Burn"),
+          eventStub("Approval"),
+        ],
+      },
+    ],
+    autoUpdate: false,
+    eventsHref: "/ethereum/0x123456789/events",
+  },
+};
+
+export const LiveWithEvents: Story = {
+  args: {
+    allEvents: [
+      {
+        transactionHash: txStub,
+        events: [eventStub("Transfer"), eventStub("Approval")],
+      },
+      {
+        transactionHash: txStub,
+        events: [eventStub("Mint")],
+      },
+      {
+        transactionHash: txStub,
+        events: [
+          eventStub("Transfer"),
+          eventStub("Burn"),
+          eventStub("Approval"),
+        ],
+      },
+      {
+        transactionHash: txStub,
+        events: [eventStub("RoleGranted"), eventStub("OwnershipTransferred")],
+      },
+    ],
+    autoUpdate: true,
+    eventsHref: "/ethereum/0x123456789/events",
+  },
+};
@@ -1,192 +1,145 @@
 "use client";

+import { CopyTextButton } from "@/components/ui/CopyTextButton";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+import { TrackedLinkTW } from "@/components/ui/tracked-link";
 import {
  type InternalTransaction,
  useActivity,
 } from "@3rdweb-sdk/react/hooks/useActivity";
-import {
-  Box,
-  ButtonGroup,
-  Flex,
-  List,
-  SimpleGrid,
-  Spinner,
-  Tooltip,
-} from "@chakra-ui/react";
-import { useClipboard } from "hooks/useClipboard";
-import { CopyIcon } from "lucide-react";
-import { useState } from "react";
-import { toast } from "sonner";
+import { ArrowRightIcon } from "lucide-react";
+import Link from "next/link";
 import type { ThirdwebContract } from "thirdweb";
-import {
-  Button,
-  Card,
-  Heading,
-  LinkButton,
-  Text,
-  TrackedLink,
-  type TrackedLinkProps,
-} from "tw-components";
 import { shortenString } from "utils/usedapp-external";

-interface LatestEventsProps {
-  trackingCategory: TrackedLinkProps["category"];
+export function LatestEvents(props: {
+  trackingCategory: string;
  contract: ThirdwebContract;
  chainSlug: string;
-}
-
-export const LatestEvents: React.FC<LatestEventsProps> = ({
-  contract,
-  trackingCategory,
-  chainSlug,
-}) => {
-  const [autoUpdate] = useState(true);
-  const eventsHref = `/${chainSlug}/${contract.address}/events`;
-  const allEvents = useActivity(contract, autoUpdate);
+}) {
+  const autoUpdate = true;
+  const allEvents = useActivity(props.contract, autoUpdate);

  return (
-    <Flex gap={6} flexDirection="column">
-      <Flex align="center" justify="space-between" w="full">
-        <h2 className="font-semibold text-2xl tracking-tight">Latest Events</h2>
-        <TrackedLink
-          category={trackingCategory}
-          label="view_all_events"
-          color="blue.400"
-          _light={{
-            color: "blue.600",
-          }}
-          gap={4}
-          href={eventsHref}
-        >
-          View all -&gt;
-        </TrackedLink>
-      </Flex>
-      <Card p={0} overflow="hidden">
-        <SimpleGrid
-          gap={2}
-          columns={9}
-          borderBottomWidth="1px"
-          borderColor="borderColor"
-          padding={4}
-          bg="blackAlpha.50"
-          _dark={{ bg: "whiteAlpha.50" }}
-        >
-          <Heading gridColumn="span 3" size="label.md">
-            Transaction Hash
-          </Heading>
-          <Heading gridColumn="span 6" size="label.md">
-            Events
-          </Heading>
-        </SimpleGrid>
-
-        <List overflow="auto">
-          {allEvents.length === 0 ? (
-            <div className="flex items-center justify-center py-4">
-              <Flex align="center" gap={2}>
-                {autoUpdate && <Spinner size="sm" speed="0.69s" />}
-                <Text size="body.md" fontStyle="italic">
-                  {autoUpdate ? "listening for events" : "no events to show"}
-                </Text>
-              </Flex>
-            </div>
-          ) : null}
-          <div>
-            {allEvents?.slice(0, 3).map((e) => (
-              <EventsFeedItem
-                key={e.transactionHash}
-                transaction={e}
-                contractAddress={contract.address}
-                chainSlug={chainSlug}
-              />
-            ))}
-          </div>
-        </List>
-      </Card>
-    </Flex>
+    <LatestEventsUI
+      allEvents={allEvents}
+      autoUpdate={autoUpdate}
+      eventsHref={`/${props.chainSlug}/${props.contract.address}/events`}
+      trackingCategory={props.trackingCategory}
+    />
  );
-};
-
-interface EventsFeedItemProps {
-  transaction: InternalTransaction;
-  contractAddress: string;
-  chainSlug: string;
 }

-const EventsFeedItem: React.FC<EventsFeedItemProps> = ({
-  transaction,
-  contractAddress,
-  chainSlug,
-}) => {
-  const { onCopy } = useClipboard(transaction.transactionHash);
-  const eventsHref = `/${chainSlug}/${contractAddress}/events`;
+export function LatestEventsUI(props: {
+  allEvents: Pick<InternalTransaction, "transactionHash" | "events">[];
+  autoUpdate: boolean;
+  eventsHref: string;
+  trackingCategory: string;
+}) {
+  const { allEvents, autoUpdate, eventsHref } = props;

  return (
-    <div>
-      <SimpleGrid
-        columns={9}
-        gap={2}
-        as="li"
-        borderBottomWidth="1px"
-        borderColor="borderColor"
-        padding={4}
-        overflow="hidden"
-        alignItems="center"
-        _last={{ borderBottomWidth: 0 }}
-      >
-        <Box gridColumn="span 3">
-          <div className="flex flex-row items-center gap-3">
-            <Tooltip
-              p={0}
-              bg="transparent"
-              boxShadow="none"
-              label={
-                <Card py={2} px={4} bgColor="backgroundHighlight">
-                  <Text size="label.sm">
-                    Copy transaction hash to clipboard
-                  </Text>
-                </Card>
-              }
+    <div className="rounded-lg border bg-card">
+      {/* header */}
+      <div className="flex w-full items-center justify-between border-b px-6 py-4">
+        <div className="flex items-center gap-3">
+          <h2 className="font-semibold text-xl tracking-tight">
+            Latest Events
+          </h2>
+          {autoUpdate && (
+            <Badge
+              variant="outline"
+              className="hidden gap-2 bg-background text-sm lg:flex"
            >
-              <Button
-                size="sm"
-                bg="transparent"
-                onClick={() => {
-                  onCopy();
-                  toast.info("Transaction hash copied.");
-                }}
-              >
-                <CopyIcon className="size-3" />
-              </Button>
-            </Tooltip>
-            <Text fontFamily="mono" noOfLines={1}>
-              {shortenString(transaction.transactionHash)}
-            </Text>
-          </div>
-        </Box>
-
-        <ButtonGroup
-          size="sm"
-          variant="outline"
-          gridColumn="span 6"
-          flexWrap="wrap"
-          gap={2}
-          spacing={0}
-        >
-          {transaction.events.slice(0, 2).map((e, idx) => (
-            // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
-            <LinkButton key={idx} href={`${eventsHref}?event=${e.eventName}`}>
-              <Text color="whiteBg" fontWeight="600" isTruncated>
-                {e.eventName}
-              </Text>
-            </LinkButton>
-          ))}
-          {transaction.events.length > 2 && (
-            <Button as="span" pointerEvents="none">
-              + {transaction.events.length - 2}
-            </Button>
+              <span className="!pointer-events-auto relative flex size-2">
+                <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-sky-400 opacity-75" />
+                <span className="relative inline-flex size-2 rounded-full bg-primary" />
+              </span>
+              Live
+            </Badge>
          )}
-        </ButtonGroup>
-      </SimpleGrid>
+        </div>
+        <Button asChild variant="outline" size="sm" className="bg-background">
+          <TrackedLinkTW
+            category={props.trackingCategory}
+            label="view_all_events"
+            href={eventsHref}
+            className="flex items-center gap-2 text-muted-foreground text-sm"
+          >
+            View all <ArrowRightIcon className="size-4" />
+          </TrackedLinkTW>
+        </Button>
+      </div>
+
+      {/* table */}
+      <TableContainer className="w-full border-none">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead className="w-52">Transaction Hash</TableHead>
+              <TableHead>Events</TableHead>
+            </TableRow>
+          </TableHeader>
+
+          <TableBody>
+            {allEvents.slice(0, 3).map((transaction) => (
+              <TableRow key={transaction.transactionHash}>
+                <TableCell>
+                  <CopyTextButton
+                    textToShow={shortenString(transaction.transactionHash)}
+                    textToCopy={transaction.transactionHash}
+                    tooltip="Copy transaction hash"
+                    copyIconPosition="left"
+                    variant="ghost"
+                    className="-translate-x-2 font-mono"
+                  />
+                </TableCell>
+                <TableCell>
+                  <div className="flex w-max flex-wrap gap-2">
+                    {transaction.events.map((e) => (
+                      <Button
+                        key={e.logIndex + e.address + e.eventName}
+                        variant="outline"
+                        size="sm"
+                        className="h-auto rounded-full py-1"
+                        asChild
+                      >
+                        <Link href={`${eventsHref}?event=${e.eventName}`}>
+                          {e.eventName}
+                        </Link>
+                      </Button>
+                    ))}
+                  </div>
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+
+      {allEvents.length === 0 && (
+        <div className="flex h-48 items-center justify-center text-sm">
+          {autoUpdate ? (
+            <div className="flex items-center gap-2">
+              <Spinner className="size-4" />
+              <p>Listening for events</p>
+            </div>
+          ) : (
+            <p>No events found</p>
+          )}
+        </div>
+      )}
    </div>
  );
-};
+}
@@ -2,8 +2,10 @@

 import { WalletAddress } from "@/components/blocks/wallet-address";
 import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
 import { SkeletonContainer } from "@/components/ui/skeleton";
 import { TrackedLinkTW } from "@/components/ui/tracked-link";
+import { ArrowRightIcon } from "lucide-react";
 import { useMemo } from "react";
 import type { ThirdwebContract } from "thirdweb";
 import {
@@ -79,28 +81,37 @@ const DirectListingCards: React.FC<ListingCardsSectionProps> = ({
  }

  return (
-    <>
-      <div className="flex w-full items-center justify-between">
-        <h2 className="font-semibold text-2xl tracking-tight">
-          Direct Listing
+    <div className="rounded-lg border bg-card">
+      <div className="flex w-full items-center justify-between border-b px-6 py-4">
+        <h2 className="font-semibold text-xl tracking-tight">
+          Direct Listings
        </h2>
-        <TrackedLinkTW
-          category={trackingCategory}
-          label="view_all_direct_listings"
-          className="text-link-foreground hover:text-foreground"
-          href={directListingsHref}
+        <Button
+          asChild
+          variant="outline"
+          size="sm"
+          className="gap-2 bg-background text-muted-foreground"
        >
-          View all -&gt;
-        </TrackedLinkTW>
+          <TrackedLinkTW
+            category={trackingCategory}
+            label="view_all_direct_listings"
+            href={directListingsHref}
+          >
+            View all <ArrowRightIcon className="size-4" />
+          </TrackedLinkTW>
+        </Button>
      </div>
-      <ListingCards
-        listings={listings}
-        isPending={listingsQuery.isPending}
-        trackingCategory={trackingCategory}
-        chainSlug={chainSlug}
-        contractAddress={contract.address}
-      />
-    </>
+
+      <div className="p-6">
+        <ListingCards
+          listings={listings}
+          isPending={listingsQuery.isPending}
+          trackingCategory={trackingCategory}
+          chainSlug={chainSlug}
+          contractAddress={contract.address}
+        />
+      </div>
+    </div>
  );
 };

@@ -142,28 +153,36 @@ const EnglishAuctionCards: React.FC<ListingCardsSectionProps> = ({
  }

  return (
-    <>
-      <div className="flex w-full items-center justify-between">
-        <h2 className="font-semibold text-2xl tracking-tight">
+    <div className="rounded-lg border bg-card">
+      <div className="flex w-full items-center justify-between border-b px-6 py-4">
+        <h2 className="font-semibold text-xl tracking-tight">
          English Auctions
        </h2>
-        <TrackedLinkTW
-          category={trackingCategory}
-          label="view_all_english_auctions"
-          className="text-link-foreground hover:text-foreground"
-          href={englishAuctionsHref}
+        <Button
+          asChild
+          variant="outline"
+          size="sm"
+          className="gap-2 bg-background text-muted-foreground"
        >
-          View all -&gt;
-        </TrackedLinkTW>
+          <TrackedLinkTW
+            category={trackingCategory}
+            label="view_all_english_auctions"
+            href={englishAuctionsHref}
+          >
+            View all <ArrowRightIcon className="size-4" />
+          </TrackedLinkTW>
+        </Button>
      </div>
-      <ListingCards
-        listings={auctions}
-        isPending={auctionsQuery.isPending}
-        trackingCategory={trackingCategory}
-        chainSlug={chainSlug}
-        contractAddress={contract.address}
-      />
-    </>
+      <div className="p-6">
+        <ListingCards
+          listings={auctions}
+          isPending={auctionsQuery.isPending}
+          trackingCategory={trackingCategory}
+          chainSlug={chainSlug}
+          contractAddress={contract.address}
+        />
+      </div>
+    </div>
  );
 };

@@ -183,8 +202,7 @@ export const MarketplaceDetails: React.FC<MarketplaceDetailsVersionProps> = ({
  chainSlug,
 }) => {
  return (
-    <div className="flex flex-col gap-6">
-      <h2 className="font-semibold text-2xl tracking-tight">Listings</h2>
+    <div className="flex flex-col gap-10">
      <ListingStatsV3
        contract={contract}
        hasDirectListings={hasDirectListings}
@@ -262,12 +280,16 @@ const ListingCards: React.FC<ListingCardsProps> = ({
  const englishAuctionsHref = `/${chainSlug}/${contractAddress}/english-auctions`;

  return (
-    <div className="grid grid-cols-2 gap-3 md:grid-cols-3 md:gap-6 max-sm:[&>*:nth-child(n+3)]:hidden">
+    <div className="grid grid-cols-1 gap-4 md:grid-cols-3 ">
      {listings.map((listing, index) => (
        <div
-          className="relative rounded-lg border border-border bg-card transition-colors hover:border-active-border"
+          className="group hover:-translate-y-0.5 relative flex h-full cursor-pointer flex-col rounded-lg bg-background duration-200 hover:scale-[1.01]"
          key={`${listing.creatorAddress}-${index}`}
        >
+          {/* border */}
+          <div className="absolute inset-0 rounded-lg border border-border" />
+
+          {/* image */}
          <div className="relative aspect-square w-full overflow-hidden rounded-lg">
            {/* Image */}
            <SkeletonContainer
@@ -324,21 +346,23 @@ const ListingCards: React.FC<ListingCardsProps> = ({
              />
            )}

+            {/* seller */}
            <SkeletonContainer
              loadedData={isPending ? undefined : listing.creatorAddress}
              skeletonData={listing.creatorAddress}
-              className="mt-4"
+              className="mt-4 border-t pt-4"
              render={(v) => (
                <div>
-                  <p className="text-muted-foreground text-sm">Seller</p>
+                  <p className="text-muted-foreground text-xs">Seller</p>
                  <WalletAddress
-                    className="relative z-[1] self-start"
+                    className="relative z-[1] self-start text-xs"
                    address={v}
                  />
                </div>
              )}
            />

+            {/* price */}
            {!isPending && (
              <Badge
                variant="outline"
@@ -1,27 +1,27 @@
 "use client";

-import { Flex, useBreakpointValue } from "@chakra-ui/react";
+import { Button } from "@/components/ui/button";
+import { TrackedLinkTW } from "@/components/ui/tracked-link";
+import { ArrowRightIcon } from "lucide-react";
 import type { ThirdwebContract } from "thirdweb";
 import * as ERC721 from "thirdweb/extensions/erc721";
 import * as ERC1155 from "thirdweb/extensions/erc1155";
 import { useReadContract } from "thirdweb/react";
-import { TrackedLink, type TrackedLinkProps } from "tw-components/link";
 import { NFTCards } from "../../_components/NFTCards";

-interface NFTDetailsProps {
+type NFTDetailsProps = {
  contract: ThirdwebContract;
-  trackingCategory: TrackedLinkProps["category"];
+  trackingCategory: string;
  isErc721: boolean;
  chainSlug: string;
-}
+};

-export const NFTDetails: React.FC<NFTDetailsProps> = ({
+export function NFTDetails({
  contract,
  trackingCategory,
  isErc721,
  chainSlug,
-}) => {
-  const isMobile = useBreakpointValue({ base: true, md: false });
+}: NFTDetailsProps) {
  const nftsHref = `/${chainSlug}/${contract.address}/nfts`;

  const nftQuery = useReadContract(
@@ -36,34 +36,37 @@ export const NFTDetails: React.FC<NFTDetailsProps> = ({
  const displayableNFTs =
    nftQuery.data
      ?.filter((token) => token.metadata.image || token.metadata.animation_url)
-      .slice(0, isMobile ? 2 : 3) || [];
+      .slice(0, 3) || [];

  return displayableNFTs.length === 0 && !nftQuery.isPending ? null : (
-    <Flex direction="column" gap={{ base: 3, md: 6 }}>
-      <Flex align="center" justify="space-between" w="full">
-        <h2 className="font-semibold text-2xl tracking-tight">NFT Details</h2>
-        <TrackedLink
-          category={trackingCategory}
-          label="view_all_nfts"
-          color="blue.400"
-          _light={{
-            color: "blue.600",
-          }}
-          gap={4}
-          href={nftsHref}
-        >
-          View all -&gt;
-        </TrackedLink>
-      </Flex>
-      <NFTCards
-        nfts={displayableNFTs.map((t) => ({
-          ...t,
-          contractAddress: contract.address,
-          chainId: contract.chain.id,
-        }))}
-        trackingCategory={trackingCategory}
-        isPending={nftQuery.isPending}
-      />
-    </Flex>
+    <div className="rounded-lg border bg-card">
+      {/* header */}
+      <div className="flex items-center justify-between border-b px-6 py-4">
+        <h2 className="font-semibold text-xl tracking-tight">NFTs</h2>
+        <Button variant="outline" asChild className="bg-background" size="sm">
+          <TrackedLinkTW
+            category={trackingCategory}
+            label="view_all_nfts"
+            href={nftsHref}
+            className="text-muted-foreground"
+          >
+            View all <ArrowRightIcon className="ml-2 size-4 " />
+          </TrackedLinkTW>
+        </Button>
+      </div>
+
+      {/* cards */}
+      <div className="p-6">
+        <NFTCards
+          nfts={displayableNFTs.map((t) => ({
+            ...t,
+            contractAddress: contract.address,
+            chainId: contract.chain.id,
+          }))}
+          trackingCategory={trackingCategory}
+          isPending={nftQuery.isPending}
+        />
+      </div>
+    </div>
  );
-};
+}
@@ -0,0 +1,84 @@
+import type { Meta, StoryObj } from "@storybook/react";
+import { ThirdwebProvider } from "thirdweb/react";
+import { PermissionsTableUI } from "./PermissionsTable";
+
+const meta: Meta<typeof PermissionsTableUI> = {
+  title: "Contracts/Overview/PermissionsTable",
+  component: PermissionsTableUI,
+  decorators: [
+    (Story) => (
+      <ThirdwebProvider>
+        <div className="container max-w-4xl py-10">
+          <Story />
+        </div>
+      </ThirdwebProvider>
+    ),
+  ],
+  args: {
+    viewMoreLink: "#",
+    trackingCategory: "test-category",
+    members: [],
+    isPending: false,
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof PermissionsTableUI>;
+
+export const Loading: Story = {
+  args: {
+    isPending: true,
+    members: [],
+  },
+};
+
+export const NoMembers: Story = {
+  args: {
+    isPending: false,
+    members: [],
+  },
+};
+
+export const OneMember: Story = {
+  args: {
+    isPending: false,
+    members: [
+      {
+        member: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
+        roles: ["admin"],
+      },
+    ],
+  },
+};
+
+export const FiveMembers: Story = {
+  args: {
+    isPending: false,
+    members: [
+      {
+        member: "0x1F846F6DAE38E1C88D71EAA191760B15f38B7A37",
+        roles: ["admin", "minter"],
+      },
+      {
+        member: "0x83Dd93fA5D8343094f850f90B3fb90088C1bB425",
+        roles: ["transfer"],
+      },
+      {
+        member: "0x1f4202eD5c33d229bCda7B9B6AB3B57caDf423e6",
+        roles: ["admin", "transfer", "minter"],
+      },
+      {
+        member: "0x6844F0056d4C84CA2a894Fcf85473d75d8252b24",
+        roles: [
+          "admin",
+          "minter",
+          "transfer",
+          "metadata",
+          "burner",
+          "manager",
+          "lister",
+        ],
+      },
+    ],
+  },
+};
@@ -1,36 +1,34 @@
 "use client";

-import { ToolTipLabel } from "@/components/ui/tooltip";
-import { Box, Flex, List, SimpleGrid, Tag } from "@chakra-ui/react";
+import { WalletAddress } from "@/components/blocks/wallet-address";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+import { TrackedLinkTW } from "@/components/ui/tracked-link";
 import { getAllRoleMembers } from "contract-ui/hooks/permissions";
-import { useClipboard } from "hooks/useClipboard";
-import { CopyIcon } from "lucide-react";
+import { ArrowRightIcon } from "lucide-react";
 import { useMemo } from "react";
-import { toast } from "sonner";
 import { type ThirdwebContract, ZERO_ADDRESS } from "thirdweb";
 import { useReadContract } from "thirdweb/react";
-import { Button } from "tw-components/button";
-import { Card } from "tw-components/card";
-import { Heading } from "tw-components/heading";
-import { TrackedLink, type TrackedLinkProps } from "tw-components/link";
-import { Text } from "tw-components/text";
-import { shortenIfAddress } from "utils/usedapp-external";

-interface PermissionsTableProps {
+export function PermissionsTable(props: {
  contract: ThirdwebContract;
-  trackingCategory: TrackedLinkProps["category"];
+  trackingCategory: string;
  chainSlug: string;
-}
-
-export const PermissionsTable: React.FC<PermissionsTableProps> = ({
-  contract,
-  trackingCategory,
-  chainSlug,
-}) => {
+}) {
  const allRoleMembers = useReadContract(getAllRoleMembers, {
-    contract,
+    contract: props.contract,
  });
-  const permissionsHref = `/${chainSlug}/${contract.address}/permissions`;
+
  const members = useMemo(() => {
    return (
      Object.entries(allRoleMembers.data || {}).reduce(
@@ -52,128 +50,82 @@ export const PermissionsTable: React.FC<PermissionsTableProps> = ({
  }, [allRoleMembers.data]);

  return (
-    <Flex gap={6} flexDirection="column">
-      <Flex align="center" justify="space-between" w="full">
-        <h2 className="font-semibold text-2xl tracking-tight">Permissions</h2>
-        <TrackedLink
-          category={trackingCategory}
-          label="view_all_permissions"
-          color="blue.400"
-          _light={{
-            color: "blue.600",
-          }}
-          gap={4}
-          href={permissionsHref}
-        >
-          View all -&gt;
-        </TrackedLink>
-      </Flex>
-      {contract && (
-        <Card p={0} overflow="hidden">
-          <SimpleGrid
-            gap={2}
-            columns={9}
-            borderBottomWidth="1px"
-            borderColor="borderColor"
-            padding={4}
-            bg="blackAlpha.50"
-            _dark={{ bg: "whiteAlpha.50" }}
-          >
-            <Heading gridColumn="span 3" size="label.md">
-              Member
-            </Heading>
-            <Heading gridColumn="span 6" size="label.md">
-              Roles
-            </Heading>
-          </SimpleGrid>
-
-          <List overflow="auto">
-            {members.length === 0 && (
-              <div className="flex items-center justify-center py-4">
-                <Flex align="center" gap={2}>
-                  <Text size="body.md" fontStyle="italic">
-                    {allRoleMembers.isPending
-                      ? "loading permissions"
-                      : "no permissions found"}
-                  </Text>
-                </Flex>
-              </div>
-            )}
-            <div>
-              {members.map((e) => (
-                <PermissionsItem key={e.member} data={e} />
-              ))}
-            </div>
-          </List>
-        </Card>
-      )}
-    </Flex>
+    <PermissionsTableUI
+      members={members}
+      isPending={allRoleMembers.isPending}
+      viewMoreLink={`/${props.chainSlug}/${props.contract.address}/permissions`}
+      trackingCategory={props.trackingCategory}
+    />
  );
-};
-
-interface PermissionsItemProps {
-  data: { member: string; roles: string[] };
 }

-const PermissionsItem: React.FC<PermissionsItemProps> = ({ data }) => {
-  const { onCopy } = useClipboard(data.member);
-
+export function PermissionsTableUI(props: {
+  viewMoreLink: string;
+  trackingCategory: string;
+  members: { member: string; roles: string[] }[];
+  isPending: boolean;
+}) {
  return (
-    <div>
-      <SimpleGrid
-        columns={9}
-        gap={2}
-        as="li"
-        borderBottomWidth="1px"
-        borderColor="borderColor"
-        padding={4}
-        overflow="hidden"
-        alignItems="center"
-        _last={{ borderBottomWidth: 0 }}
-      >
-        <Box gridColumn="span 2">
-          <div className="flex flex-row items-center gap-3">
-            <ToolTipLabel label="Copy address to clipboard">
-              <Button
-                size="sm"
-                bg="transparent"
-                onClick={() => {
-                  onCopy();
-                  toast.info("Address copied.");
-                }}
-              >
-                <CopyIcon className="size-3" />
-              </Button>
-            </ToolTipLabel>
-            <Text fontFamily="mono" noOfLines={1}>
-              {shortenIfAddress(data.member)}
-            </Text>
-          </div>
-        </Box>
+    <div className="rounded-lg border bg-card">
+      {/* header */}
+      <div className="flex w-full items-center justify-between border-b px-6 py-4">
+        <h2 className="font-semibold text-xl tracking-tight">Permissions</h2>
+        <Button asChild variant="outline" size="sm" className="bg-background">
+          <TrackedLinkTW
+            category={props.trackingCategory}
+            label="view_all_permissions"
+            href={props.viewMoreLink}
+            className="flex items-center gap-2 text-muted-foreground text-sm"
+          >
+            View all <ArrowRightIcon className="size-4" />
+          </TrackedLinkTW>
+        </Button>
+      </div>

-        <Box gridColumn="span 1" />
+      {/* table */}
+      <TableContainer className="w-full border-none">
+        <Table>
+          <TableHeader>
+            <TableRow>
+              <TableHead>Member</TableHead>
+              <TableHead>Roles</TableHead>
+            </TableRow>
+          </TableHeader>

-        <Flex gridColumn="span 6" flexWrap="wrap" gap={2}>
-          {data.roles.slice(0, 3).map((role) => (
-            <Tag key={role}>
-              <Text size="body.md" fontWeight="medium">
-                {role}
-              </Text>
-            </Tag>
-          ))}
-          {data.roles.length > 3 && (
-            <Tag
-              border="2px solid"
-              borderColor="var(--badge-bg)"
-              bg="transparent"
-            >
-              <Text size="body.md" fontWeight="medium">
-                + {data.roles.length - 3}
-              </Text>
-            </Tag>
+          <TableBody>
+            {props.members.map((data) => (
+              <TableRow key={data.member}>
+                <TableCell>
+                  <WalletAddress address={data.member} />
+                </TableCell>
+                <TableCell>
+                  <div className="flex w-max flex-wrap gap-2">
+                    {data.roles.map((role) => (
+                      <Badge
+                        variant="outline"
+                        key={role}
+                        className="bg-background py-1 font-normal text-sm capitalize"
+                      >
+                        {role}
+                      </Badge>
+                    ))}
+                  </div>
+                </TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+
+      {props.members.length === 0 && (
+        <div className="flex h-48 items-center justify-center text-sm">
+          {props.isPending ? (
+            <Spinner className="size-8" />
+          ) : (
+            <p>No Permissions</p>
          )}
-        </Flex>
-      </SimpleGrid>
+        </div>
+      )}
    </div>
  );
-};
+}
@@ -1,17 +0,0 @@
-import type { ThirdwebContract } from "thirdweb";
-import { TokenSupply } from "../../tokens/components/supply";
-
-interface TokenDetailsProps {
-  contract: ThirdwebContract;
-}
-
-export const TokenDetails: React.FC<TokenDetailsProps> = ({ contract }) => {
-  return (
-    <div className="flex flex-col gap-6">
-      <div className="flex w-full flex-row items-center justify-between">
-        <h2 className="font-semibold text-2xl tracking-tight">Token Details</h2>
-      </div>
-      <TokenSupply contract={contract} />
-    </div>
-  );
-};
--- a/Show More
+++ b/Show More