Version Packages (#7682)

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

.changeset/config.json

@@ -1,5 +1,11 @@
 {
+  "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
+    "onlyUpdatePeerDependentsWhenOutOfRange": true,
+    "updateInternalDependents": "always"
+  },
   "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+  "access": "public",
+  "baseBranch": "main",
   "changelog": [
     "@changesets/changelog-github",
     {
@@ -7,21 +13,15 @@
     }
   ],
   "commit": false,
-  "access": "public",
-  "baseBranch": "main",
-  "updateInternalDependencies": "patch",
   "ignore": [
     "playground-web",
     "thirdweb-dashboard",
     "wallet-ui",
     "portal",
-    "thirdweb-login"
+    "nebula-app"
   ],
-  "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
-    "updateInternalDependents": "always",
-    "onlyUpdatePeerDependentsWhenOutOfRange": true
-  },
   "snapshot": {
     "prereleaseTemplate": "{tag}-{commit}-{datetime}"
-  }
+  },
+  "updateInternalDependencies": "patch"
 }

.cursor/rules/dashboard.mdc

@@ -3,7 +3,6 @@ description: Rules for writing features in apps/dashboard
 globs: dashboard
 alwaysApply: false
 ---
-
 # Reusable Core UI Components
 
 - Always import from the central UI library under `@/components/ui/*` – e.g. `import { Button } from "@/components/ui/button"`.
@@ -101,3 +100,29 @@ Guidelines:
 - Keep `queryKey` stable and descriptive for cache hits.
 - Prefer API routes or server actions to keep tokens secret; the browser only sees relative paths.
 - Configure `staleTime` / `cacheTime` according to freshness requirements.
+
+# Analytics Event Reporting
+
+- **Add events intentionally** – only when they answer a concrete product/business question.
+- **Event name**: human-readable `<subject> <verb>` phrase (e.g. `"contract deployed"`).
+- **Reporting helper**: `report<Subject><Verb>` (PascalCase); all live in `src/@/analytics/report.ts`.
+- **Mandatory JSDoc**: explain *Why* the event exists and *Who* owns it (`@username`).
+- **Typed properties**: accept a single `properties` object and pass it unchanged to `posthog.capture`.
+- **Client-side only**: never import `posthog-js` in server components.
+- **Housekeeping**: ping **#core-services** before renaming or removing an event.
+
+```ts
+/**
+ * ### Why do we need to report this event?
+ * - Tracks number of contracts deployed
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ */
+export function reportContractDeployed(properties: {
+  address: string;
+  chainId: number;
+}) {
+  posthog.capture("contract deployed", properties);
+}
+```

.github/workflows/CI.yml

@@ -61,9 +61,9 @@ jobs:
         uses: ./.github/composite-actions/install
 
       - name: Setup Biome
-        uses: biomejs/setup-biome@f382a98e582959e6aaac8e5f8b17b31749018780 # v2.5.0
+        uses: biomejs/setup-biome@a9763ed3d2388f5746f9dc3e1a55df7f4609bc89 # v2.5.1
         with:
-          version: latest  
+          version: 2.0.6
 
       - run: pnpm lint
 
@@ -89,7 +89,7 @@ jobs:
       - run: pnpm test
 
       - name: Code Coverage
-        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
         with:
           directory: packages/
           flags: packages

.github/workflows/codeql-analysis.yml

@@ -46,7 +46,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -72,4 +72,4 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Create release Pull Request or publish to NPM
         id: changesets
-        uses: changesets/action@746c25e23caa47dceb6a48ee85b4cbc5a9f5f293 #v1.4.0
+        uses: changesets/action@e0145edc7d9d8679003495b11f87bd8ef63c0cba #v1.4.0
         with:
           publish: pnpm release
           version: pnpm version-packages

.gitignore

@@ -16,6 +16,7 @@ yalc.lock
 ./build/
 playwright-report/
 .env/
+.pnpm-store/
 
 # codecov binary
 codecov
@@ -31,4 +32,5 @@ storybook-static
 .aider*
 
 tsconfig.tsbuildinfo
-.cursor
+.cursor
+apps/dashboard/node-compile-cache

.vscode/settings.json

@@ -1,11 +1,32 @@
 {
-  "editor.formatOnSave": true,
+  "[css]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[json]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[markdown]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "biomejs.biome"
+  },
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
-    "source.organizeImports.biome": "explicit",
-    "quickfix.biome": "explicit"
+    "quickfix.biome": "explicit",
+    "source.fixAll.biome": "explicit"
   },
   "editor.defaultFormatter": "biomejs.biome",
+  "editor.formatOnSave": true,
+  "eslint.workingDirectories": [
+    { "pattern": "./packages/*/" },
+    { "pattern": "./apps/*/" }
+  ],
   "typescript.preferences.autoImportFileExcludePatterns": [
     "./packages/thirdweb/src/exports"
   ],
@@ -15,27 +36,5 @@
     "next/dist",
     "^lucide-react/dist/lucide-react.suffixed$"
   ],
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "biomejs.biome"
-  },
-  "[typescript]": {
-    "editor.defaultFormatter": "biomejs.biome"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "biomejs.biome"
-  },
-  "[markdown]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[javascript]": {
-    "editor.defaultFormatter": "biomejs.biome"
-  },
-  "[css]": {
-    "editor.defaultFormatter": "biomejs.biome"
-  },
-  "eslint.workingDirectories": [
-    { "pattern": "./packages/*/" },
-    { "pattern": "./apps/*/" }
-  ]
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

AGENTS.md

@@ -0,0 +1,160 @@
+🤖 Codex Agent Guidelines for thirdweb-dev/js
+
+Welcome, AI copilots! This guide captures the coding standards, architectural decisions, and workflow conventions that every automated agent (and human contributor!) must follow. Unless a rule explicitly targets a sub‑project, it applies repo‑wide.
+
+⸻
+
+1. GitHub Workflow & Etiquette
+
+- Pull‑request titles must start with the affected workspace in brackets (e.g. [SDK], [Dashboard], [Portal], [Playground]).
+- Begin the PR description with a one‑sentence summary, then add a checklist of changes and reference issues with Fixes #123.
+- Keep commits small and topical – one logical change per commit.
+- Branch names should follow area/brief-topic (e.g. sdk/fix-gas-estimate). Avoid personal names.
+- Request at least one core maintainer review. Do not self‑merge unless you are the sole owner of that package.
+- All CI checks (type‑check, Biome, tests) must pass before merging.
+
+⸻
+
+2. Formatting & Linting
+
+- Biome governs formatting and linting; its rules live in biome.json.
+- Run pnpm biome check --apply before committing.
+- Avoid editor‑specific configs; rely on the shared settings.
+- make sure everything builds after each file change by running `pnpm build`
+
+⸻
+
+3. TypeScript Style Guide
+
+- Write idiomatic TypeScript: explicit function declarations and return types.
+- Limit each file to one stateless, single‑responsibility function for clarity and testability.
+- Re‑use shared types from @/types or local types.ts barrels.
+- Prefer type aliases over interface except for nominal shapes.
+- Avoid any and unknown unless unavoidable; narrow generics whenever possible.
+- Choose composition over inheritance; leverage utility types (Partial, Pick, etc.).
+
+⸻
+
+4. Testing Strategy
+
+- Co‑locate tests: foo.ts ↔ foo.test.ts.
+- Use real function invocations with stub data; avoid brittle mocks.
+- For network interactions, use Mock Service Worker (MSW) to intercept fetch/HTTP calls, mocking only scenarios that are hard to reproduce.
+- Keep tests deterministic and side‑effect free; Vitest is pre‑configured.
+- to run the tests: `cd packages thirdweb & pnpm test:dev <filename>`
+
+⸻
+
+5. packages/thirdweb
+
+5.1 Public API Surface
+
+- Export everything via the exports/ directory, grouped by feature.
+- Every public symbol must have comprehensive TSDoc:
+- Include at least one @example block that compiles.
+- Tag with one custom annotation (@beta, @internal, @experimental, etc.).
+- Comment only ambiguous logic; avoid restating TypeScript in prose.
+
+  5.2 Performance
+
+- Lazy‑load heavy dependencies inside async paths to keep the initial bundle lean:
+
+`const { jsPDF } = await import("jspdf");`
+
+⸻
+
+6. apps/dashboard & apps/playground
+
+6.1 Core UI Toolkit
+
+- Import primitives from @/components/ui/\_ (e.g. Button, Input, Select, Tabs, Card, Sidebar, Badge, Separator).
+- Use NavLink for internal navigation so active states are handled automatically.
+- Group feature‑specific components under feature/components/\_ and expose a barrel index.ts when necessary.
+
+  6.2 Styling Conventions
+
+- Tailwind CSS is the styling system – no inline styles or CSS modules.
+- Merge class names with cn() from @/lib/utils to keep conditional logic readable.
+- Stick to design tokens: backgrounds (bg-card), borders (border-border), muted text (text-muted-foreground), etc.
+- Expose a className prop on the root element of every component for overrides.
+
+  6.3 Component Patterns
+
+- Server Components (run on the Node edge):
+  -- Read cookies/headers with next/headers.
+  -- Access server‑only environment variables or secrets.
+  -- Perform heavy data fetching that should not ship to the client.
+  -- Implement redirect logic with redirect() from next/navigation.
+  -- Start files with import "server-only"; to prevent client bundling.
+- Client Components (run in the browser):
+  -- Begin files with 'use client'; before imports.
+  -- Handle interactive UI relying on React hooks (useState, useEffect, React Query, wallet hooks).
+  -- Access browser APIs (localStorage, window, IntersectionObserver, etc.).
+  -- Support fast transitions where data is prefetched on the client.
+
+  6.4 Data Fetching Guidelines
+
+- Server Side
+  -- Always call getAuthToken() to retrieve the JWT from cookies.
+  -- Inject the token as an Authorization: Bearer header – never embed it in the URL.
+  -- Return typed results (Project[], User[], …) – avoid any.
+- Client Side
+  -- Wrap calls in React Query (@tanstack/react-query).
+  -- Use descriptive, stable queryKeys for cache hits.
+  -- Configure staleTime / cacheTime based on freshness requirements (default ≥ 60 s).
+  -- Keep tokens secret by calling internal API routes or server actions.
+
+  6.5 Analytics Event Reporting
+
+- **When to create a new event**  
+  -- Only add events that answer a clear product or business question.  
+  -- Check `src/@/analytics/report.ts` first; avoid duplicates.
+
+- **Naming conventions**  
+  -- **Event name**: human-readable phrase in the form `<subject> <verb>` (e.g. "contract deployed").  
+  -- **Reporting function**: `report<Subject><Verb>` (PascalCase).  
+  -- All reporting helpers currently live in the shared `report.ts` file.
+
+- **Boilerplate template**  
+  -- Add a JSDoc header explaining **Why** the event exists and **Who** owns it (`@username`).  
+  -- Accept a single typed `properties` object and forward it unchanged to `posthog.capture`.  
+  -- Example:
+
+```ts
+/**
+ * ### Why do we need to report this event?
+ * - Tracks number of contracts deployed
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ */
+export function reportContractDeployed(properties: {
+  address: string;
+  chainId: number;
+}) {
+  posthog.capture("contract deployed", properties);
+}
+```
+
+- **Client-side only**: never import `posthog-js` in server components.  
+- **Housekeeping**: Inform **#eng-core-services** before renaming or removing an existing event.
+
+⸻
+
+7. Performance & Bundle Size
+
+- Track bundle budgets via package.json#size-limit.
+- Lazy‑import optional features; avoid top‑level side‑effects.
+- De‑duplicate dependencies across packages through pnpm workspace hoisting.
+
+⸻
+
+8. Documentation & Developer Experience
+
+- Each change in packages/\* should contain a changeset for the appropriate package, with the appropriate version bump
+
+  - patch for changes that don't impact the public API
+  - minor for any new/modified public API
+
+- Surface breaking changes prominently in PR descriptions.
+- For new UI components, add Storybook stories (\*.stories.tsx) alongside the code.

CLAUDE.md

@@ -0,0 +1,290 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Development Commands
+
+### Package Management
+
+- Use `pnpm install` (or `pnpm install --ignore-scripts` on Windows)
+- Monorepo managed with Turborepo and pnpm workspaces
+
+### Building
+
+```bash
+# Build all packages
+pnpm build
+
+# Build specific packages with dependencies
+turbo run build --filter=./packages/*
+
+# Development with watch mode
+pnpm dev                    # Core thirdweb package
+pnpm dashboard              # Run dashboard + dependencies
+pnpm playground             # Run playground + dependencies
+pnpm portal                 # Run portal docs + dependencies
+```
+
+### Testing
+
+```bash
+# Run all tests
+pnpm test
+
+# Interactive testing (thirdweb package)
+cd packages/thirdweb && pnpm test:devr
+
+# Test specific file
+pnpm test:dev <path-to-test-file>
+
+# E2E testing (dashboard)
+cd apps/dashboard && pnpm playwright
+```
+
+### Code Quality
+
+```bash
+# Lint all packages
+pnpm lint
+
+# Auto-fix linting issues
+pnpm fix
+
+# Format code
+turbo run format
+
+# Biome is the primary linter/formatter
+```
+
+### Development Workflow
+
+```bash
+# Start development server for dashboard
+pnpm dashboard
+
+# Start playground for SDK testing
+pnpm playground
+
+# Generate changeset for releases
+pnpm changeset
+
+# Version packages
+pnpm version-packages
+```
+
+## Repository Architecture
+
+### Monorepo Structure
+
+This is a Turborepo monorepo with the main thirdweb v5 SDK consolidated into `/packages/thirdweb/`. Legacy packages are in `/legacy_packages/`.
+
+### Core Package (`/packages/thirdweb/`)
+
+**Main Modules:**
+
+- `client/` - ThirdwebClient foundation
+- `chains/` - 50+ supported blockchain definitions
+- `contract/` - Contract interaction with automatic ABI resolution
+- `transaction/` - Transaction management and execution
+- `wallets/` - Comprehensive wallet integration system
+- `extensions/` - Modular contract extensions (ERC20, ERC721, etc.)
+- `auth/` - SIWE authentication and signature verification
+- `pay/` - Fiat and crypto payment infrastructure
+- `storage/` - IPFS integration for decentralized storage
+- `rpc/` - Low-level blockchain communication
+
+**Exports Structure:**
+The SDK uses modular exports from `src/exports/` including:
+
+- `thirdweb.ts` - Core client and utilities
+- `chains.ts` - Chain definitions
+- `wallets.ts` - Wallet connectors
+- `react.ts` - React hooks and components
+- `extensions/` - Contract standards and protocols
+
+### Applications (`/apps/`)
+
+- **dashboard** - Web-based developer console (Next.js, Chakra UI)
+- **playground-web** - Interactive SDK testing environment
+- **portal** - Documentation site with MDX
+- **nebula** - Account abstraction and smart wallet management
+- **wallet-ui** - Wallet interface and testing
+
+### Key Packages (`/packages/`)
+
+- **thirdweb** - Main SDK (TypeScript, React, React Native)
+- **engine** - thirdweb Engine API client
+- **insight** - Analytics and data APIs
+- **nebula** - Account abstraction client
+- **service-utils** - Shared utilities across services
+
+## Development Practices
+
+### GitHub Workflow & Pull Requests
+
+- **PR titles**: Must start with affected workspace in brackets (e.g. `[SDK]`, `[Dashboard]`, `[Portal]`, `[Playground]`)
+- **PR descriptions**: Begin with one-sentence summary, add checklist of changes, reference issues with `Fixes #123`
+- **Commits**: Keep small and topical – one logical change per commit
+- **Branch naming**: Use `area/brief-topic` format (e.g. `sdk/fix-gas-estimate`). Avoid personal names
+- **Reviews**: Request at least one core maintainer review. Do not self-merge unless sole package owner
+- **CI requirements**: All checks (type-check, Biome, tests) must pass before merging
+
+### Code Quality & Formatting
+
+- **Biome**: Primary linter/formatter (rules in `biome.json`)
+- **Pre-commit**: Run `pnpm biome check --apply` before committing
+- **Build verification**: Run `pnpm build` after each file change to ensure everything builds
+- Avoid editor-specific configs; rely on shared settings
+
+### TypeScript Guidelines
+
+- **Style**: Write idiomatic TypeScript with explicit function declarations and return types
+- **File structure**: Limit each file to one stateless, single-responsibility function for clarity
+- **Types**: Re-use shared types from `@/types` or local `types.ts` barrels
+- **Interfaces vs Types**: Prefer type aliases over interface except for nominal shapes
+- **Type safety**: Avoid `any` and `unknown` unless unavoidable; narrow generics when possible
+- **Architecture**: Choose composition over inheritance; leverage utility types (`Partial`, `Pick`, etc.)
+
+### Testing Strategy
+
+- **Co-location**: Place tests alongside code: `foo.ts` ↔ `foo.test.ts`
+- **Test approach**: Use real function invocations with stub data; avoid brittle mocks
+- **Network mocking**: Use Mock Service Worker (MSW) for fetch/HTTP call interception
+- **Test quality**: Keep tests deterministic and side-effect free
+- **Running tests**: `cd packages/thirdweb && pnpm test:dev <filename>`
+- **Test accounts**: Predefined accounts in `test/src/test-wallets.ts`
+- **Chain forking**: Use `FORKED_ETHEREUM_CHAIN` for mainnet interactions, `ANVIL_CHAIN` for isolated tests
+
+### SDK Development (`packages/thirdweb`)
+
+#### Public API Guidelines
+- **Exports**: Export everything via `exports/` directory, grouped by feature
+- **Documentation**: Every public symbol must have comprehensive TSDoc with:
+  - At least one `@example` block that compiles
+  - Custom annotation tags (`@beta`, `@internal`, `@experimental`)
+- **Comments**: Comment only ambiguous logic; avoid restating TypeScript in prose
+
+#### Performance Optimization
+- **Lazy loading**: Load heavy dependencies inside async paths to keep initial bundle lean:
+  ```typescript
+  const { jsPDF } = await import("jspdf");
+  ```
+- **Bundle budgets**: Track via `package.json#size-limit`
+- **Dependencies**: De-duplicate across packages through pnpm workspace hoisting
+
+### Dashboard & Playground Development
+
+#### UI Component Standards
+- **Core components**: Import primitives from `@/components/ui/*` (Button, Input, Select, Tabs, Card, Sidebar, Badge, Separator)
+- **Navigation**: Use `NavLink` for internal navigation with automatic active states
+- **Organization**: Group feature-specific components under `feature/components/*` with barrel `index.ts`
+
+#### Styling Conventions
+- **CSS framework**: Tailwind CSS only – no inline styles or CSS modules
+- **Class merging**: Use `cn()` from `@/lib/utils` for conditional logic
+- **Design tokens**: Use design system tokens (backgrounds: `bg-card`, borders: `border-border`, muted text: `text-muted-foreground`)
+- **Component API**: Expose `className` prop on root element for overrides
+
+#### Component Architecture
+- **Server Components** (Node edge):
+  - Start files with `import "server-only";`
+  - Read cookies/headers with `next/headers`
+  - Access server-only environment variables
+  - Perform heavy data fetching
+  - Implement redirect logic with `redirect()` from `next/navigation`
+- **Client Components** (browser):
+  - Begin files with `'use client';`
+  - Handle interactive UI with React hooks (`useState`, `useEffect`, React Query, wallet hooks)
+  - Access browser APIs (`localStorage`, `window`, `IntersectionObserver`)
+  - Support fast transitions with prefetched data
+
+#### Data Fetching Patterns
+- **Server Side**:
+  - Always call `getAuthToken()` to retrieve JWT from cookies
+  - Use `Authorization: Bearer` header – never embed tokens in URLs
+  - Return typed results (`Project[]`, `User[]`) – avoid `any`
+- **Client Side**:
+  - Wrap calls in React Query (`@tanstack/react-query`)
+  - Use descriptive, stable `queryKeys` for cache hits
+  - Configure `staleTime`/`cacheTime` based on freshness (default ≥ 60s)
+  - Keep tokens secret via internal API routes or server actions
+
+#### Analytics Event Guidelines
+- **When to add**: Only create events that answer clear product/business questions
+- **Check duplicates**: Review `src/@/analytics/report.ts` first
+- **Naming**: 
+  - Event name: human-readable `<subject> <verb>` (e.g. "contract deployed")
+  - Function: `report<Subject><Verb>` (PascalCase)
+- **Template**:
+  ```typescript
+  /**
+   * ### Why do we need to report this event?
+   * - Tracks number of contracts deployed
+   *
+   * ### Who is responsible for this event?
+   * @username
+   */
+  export function reportContractDeployed(properties: {
+    address: string;
+    chainId: number;
+  }) {
+    posthog.capture("contract deployed", properties);
+  }
+  ```
+- **Client-side only**: Never import `posthog-js` in server components
+- **Changes**: Inform **#eng-core-services** before renaming/removing events
+
+### Extension Development
+
+- Extensions follow modular pattern in `src/extensions/`
+- Auto-generated contracts from ABI definitions
+- Composable functions with TypeScript safety
+- Support for read/write operations
+
+### Wallet Architecture
+
+- Unified `Wallet` and `Account` interfaces
+- Support for in-app wallets (social/email login)
+- Smart wallets with account abstraction
+- EIP-1193, EIP-5792, EIP-7702 standard support
+
+## Contribution Workflow
+
+1. **Fork and Clone**: Create fork, clone, create feature branch
+2. **Install**: `pnpm install` (use `--ignore-scripts` on Windows)
+3. **Develop**: Use appropriate dev commands above
+4. **Test**: Write unit tests, run linting, test on demo apps
+5. **Changeset**: Run `pnpm changeset` for semantic versioning
+6. **PR**: Submit pull request to main branch
+
+### Release Testing
+
+Comment `/release-pr` on PR to trigger dev release to npm for testing.
+
+### Changeset Guidelines
+
+Each change in `packages/*` should contain a changeset for the appropriate package with the appropriate version bump:
+- **patch**: Changes that don't impact the public API
+- **minor**: Any new/modified public API
+- **major**: Breaking changes (surface prominently in PR descriptions)
+
+### Documentation Standards
+
+- For new UI components, add Storybook stories (`*.stories.tsx`) alongside the code
+- Surface breaking changes prominently in PR descriptions
+- Keep documentation focused on developer experience and practical usage
+
+## Multi-Platform Support
+
+The SDK supports:
+
+- **Web**: React hooks and components
+- **React Native**: Mobile-specific exports and components
+- **Node.js**: Server-side functionality
+- **Framework Adapters**: Wagmi, Ethers compatibility layers
+
+Key files:
+
+- `src/exports/react.native.ts` - React Native specific exports
+- `packages/react-native-adapter/` - Mobile platform shims
+- `packages/wagmi-adapter/` - Wagmi ecosystem integration

apps/dashboard/.env.example

@@ -37,16 +37,13 @@ NEXT_PUBLIC_TYPESENSE_CONTRACT_API_KEY=
 
 # posthog API key
 # - not required for prod/staging
-NEXT_PUBLIC_POSTHOG_API_KEY="ignored"
+NEXT_PUBLIC_POSTHOG_KEY=""
 
 # Stripe Customer portal
 NEXT_PUBLIC_STRIPE_KEY=
 
 NEXT_PUBLIC_STRIPE_PAYMENT_METHOD_CFG_ID=
 
-# Needed for contract analytics / blockchain data information
-CHAINSAW_API_KEY=
-
 #
 # Private (server)
 #
@@ -65,17 +62,11 @@ MORALIS_API_KEY=
 # - not required to build (unless testing wallet NFTs)>
 SSR_ALCHEMY_KEY=
 
-# beehiiv.com API key (used for newsletter signups)
-# - not required to build (unless testing newsletter signups)>
-BEEHIIV_API_KEY=
 
 # Hubspot Access Token (used for contact us form)
 # - not required to build (unless testing contact us form)>
 HUBSPOT_ACCESS_TOKEN=
 
-# Github API Token (used for /open-source)
-GITHUB_API_TOKEN="ghp_..."
-
 # Upload server url
 NEXT_PUBLIC_DASHBOARD_UPLOAD_SERVER="https://storage.thirdweb-preview.com"
 
@@ -100,8 +91,6 @@ REDIS_URL=""
 
 ANALYTICS_SERVICE_URL=""
 
-# Required for Nebula Chat
-NEXT_PUBLIC_NEBULA_URL=""
 
 # required for billing parts of the dashboard (team -> settings -> billing / invoices)
 STRIPE_SECRET_KEY=""

apps/dashboard/.eslintrc.js

@@ -1,52 +1,98 @@
 module.exports = {
+  env: {
+    browser: true,
+    node: true,
+  },
   extends: [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:@next/next/recommended",
     "plugin:storybook/recommended",
   ],
+  overrides: [
+    // disable restricted imports in chakra
+    {
+      files: "src/chakra/**/*",
+      rules: {
+        "no-restricted-imports": ["off"],
+      },
+    },
+    // allow direct PostHog imports inside analytics helpers
+    {
+      files: "src/@/analytics/**/*",
+      rules: {
+        "no-restricted-imports": ["off"],
+      },
+    },
+    // enable rule specifically for TypeScript files
+    {
+      files: ["*.ts", "*.tsx"],
+      rules: {
+        "@typescript-eslint/explicit-module-boundary-types": ["off"],
+      },
+    },
+
+    // in test files, allow null assertions and anys and eslint is sometimes weird about the react-scope thing
+    {
+      files: ["*test.ts?(x)"],
+      rules: {
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-non-null-assertion": "off",
+
+        "react/display-name": "off",
+      },
+    },
+    // allow requires in non-transpiled JS files and logical key ordering in config files
+    {
+      files: [
+        "babel-node.js",
+        "*babel.config.js",
+        "env.config.js",
+        "next.config.js",
+        "webpack.config.js",
+        "packages/mobile-web/package-builder/**",
+      ],
+      rules: {},
+    },
+
+    // setupTests can have separated imports for logical grouping
+    {
+      files: ["setupTests.ts"],
+      rules: {
+        "import/newline-after-import": "off",
+      },
+    },
+    // turn OFF unused vars via eslint
+    {
+      files: ["*.ts", "*.tsx"],
+      rules: {
+        "@next/next/no-img-element": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+      },
+    },
+    // THIS NEEDS TO GO LAST!
+    {
+      extends: ["biome"],
+      files: ["*.ts", "*.js", "*.tsx", "*.jsx"],
+    },
+  ],
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    ecmaFeatures: {
+      impliedStrict: true,
+      jsx: true,
+    },
+    ecmaVersion: 2019,
+    warnOnUnsupportedTypeScriptVersion: true,
+  },
+  plugins: ["@typescript-eslint", "react-compiler"],
   rules: {
-    "react-compiler/react-compiler": "error",
-    "no-restricted-syntax": [
-      "error",
-      {
-        selector: "CallExpression[callee.name='useEffect']",
-        message:
-          'Are you *sure* you need to use "useEffect" here? If you loading any async function prefer using "useQuery".',
-      },
-      {
-        selector: "CallExpression[callee.name='createContext']",
-        message:
-          'Are you *sure* you need to use a "Context"? In almost all cases you should prefer passing props directly.',
-      },
-      {
-        selector: "CallExpression[callee.name='defineChain']",
-        message:
-          "Use useV5DashboardChain instead if you are using it inside a component",
-      },
-      {
-        selector: "CallExpression[callee.name='defineDashboardChain']",
-        message:
-          "Use useV5DashboardChain instead if you are using it inside a component",
-      },
-      {
-        selector: "CallExpression[callee.name='mapV4ChainToV5Chain']",
-        message:
-          "Use useV5DashboardChain instead if you are using it inside a component",
-      },
-      {
-        selector: "CallExpression[callee.name='resolveScheme']",
-        message:
-          "resolveScheme can throw error if resolution fails. Either catch the error and ignore the lint warning or Use `resolveSchemeWithErrorHandler` / `replaceIpfsUrl` utility in dashboard instead",
-      },
-    ],
     "no-restricted-imports": [
       "error",
       {
         paths: [
           {
-            name: "@chakra-ui/react",
-            // these are provided by tw-components, so we don't want to import them from chakra directly
+            // these are provided by chakra folder, so we don't want to import them from chakra directly
             importNames: [
               "Card",
               "Button",
@@ -81,48 +127,72 @@ module.exports = {
               "StackProps",
             ],
             message:
-              'Use the equivalent component from "tw-components" instead.',
+              'import component from "chakra" folder instead if you have to use chakra component, But use shadcn component otherwise',
+            name: "@chakra-ui/react",
           },
           {
-            name: "@chakra-ui/layout",
             message:
               "Import from `@chakra-ui/react` instead of `@chakra-ui/layout`.",
+            name: "@chakra-ui/layout",
           },
           {
-            name: "@chakra-ui/button",
             message:
               "Import from `@chakra-ui/react` instead of `@chakra-ui/button`.",
+            name: "@chakra-ui/button",
           },
           {
-            name: "@chakra-ui/menu",
             message:
               "Import from `@chakra-ui/react` instead of `@chakra-ui/menu`.",
+            name: "@chakra-ui/menu",
           },
           {
-            name: "next/navigation",
             importNames: ["useRouter"],
             message:
               'Use `import { useDashboardRouter } from "@/lib/DashboardRouter";` instead',
+            name: "next/navigation",
           },
           {
-            name: "lucide-react",
-            importNames: ["Link", "Table", "Sidebar"],
             message:
-              'This is likely a mistake. If you really want to import this - postfix the imported name with Icon. Example - "LinkIcon"',
+              'Import "posthog-js" directly only within the analytics helpers ("src/@/analytics/*"). Use the exported helpers from "@/analytics/track" elsewhere.',
+            name: "posthog-js",
           },
         ],
       },
     ],
-  },
-  parser: "@typescript-eslint/parser",
-  plugins: ["@typescript-eslint", "react-compiler"],
-  parserOptions: {
-    ecmaVersion: 2019,
-    ecmaFeatures: {
-      impliedStrict: true,
-      jsx: true,
-    },
-    warnOnUnsupportedTypeScriptVersion: true,
+    "no-restricted-syntax": [
+      "error",
+      {
+        message:
+          'Are you *sure* you need to use "useEffect" here? If you loading any async function prefer using "useQuery".',
+        selector: "CallExpression[callee.name='useEffect']",
+      },
+      {
+        message:
+          'Are you *sure* you need to use a "Context"? In almost all cases you should prefer passing props directly.',
+        selector: "CallExpression[callee.name='createContext']",
+      },
+      {
+        message:
+          "Use useV5DashboardChain instead if you are using it inside a component",
+        selector: "CallExpression[callee.name='defineChain']",
+      },
+      {
+        message:
+          "Use useV5DashboardChain instead if you are using it inside a component",
+        selector: "CallExpression[callee.name='defineDashboardChain']",
+      },
+      {
+        message:
+          "Use useV5DashboardChain instead if you are using it inside a component",
+        selector: "CallExpression[callee.name='mapV4ChainToV5Chain']",
+      },
+      {
+        message:
+          "resolveScheme can throw error if resolution fails. Either catch the error and ignore the lint warning or Use `resolveSchemeWithErrorHandler` / `replaceIpfsUrl` utility in dashboard instead",
+        selector: "CallExpression[callee.name='resolveScheme']",
+      },
+    ],
+    "react-compiler/react-compiler": "error",
   },
   settings: {
     react: {
@@ -131,60 +201,4 @@ module.exports = {
       version: "detect",
     },
   },
-  overrides: [
-    // disable restricted imports in tw-components
-    {
-      files: "src/tw-components/**/*",
-      rules: {
-        "no-restricted-imports": ["off"],
-      },
-    },
-    // enable rule specifically for TypeScript files
-    {
-      files: ["*.ts", "*.tsx"],
-      rules: {
-        "@typescript-eslint/explicit-module-boundary-types": ["off"],
-      },
-    },
-
-    // in test files, allow null assertions and anys and eslint is sometimes weird about the react-scope thing
-    {
-      files: ["*test.ts?(x)"],
-      rules: {
-        "@typescript-eslint/no-non-null-assertion": "off",
-        "@typescript-eslint/no-explicit-any": "off",
-
-        "react/display-name": "off",
-      },
-    },
-    // allow requires in non-transpiled JS files and logical key ordering in config files
-    {
-      files: [
-        "babel-node.js",
-        "*babel.config.js",
-        "env.config.js",
-        "next.config.js",
-        "webpack.config.js",
-        "packages/mobile-web/package-builder/**",
-      ],
-      rules: {},
-    },
-
-    // setupTests can have separated imports for logical grouping
-    {
-      files: ["setupTests.ts"],
-      rules: {
-        "import/newline-after-import": "off",
-      },
-    },
-    // THIS NEEDS TO GO LAST!
-    {
-      files: ["*.ts", "*.js", "*.tsx", "*.jsx"],
-      extends: ["biome"],
-    },
-  ],
-  env: {
-    browser: true,
-    node: true,
-  },
 };

apps/dashboard/.storybook/main.ts

@@ -13,9 +13,8 @@ const config: StorybookConfig = {
   addons: [
     getAbsolutePath("@storybook/addon-onboarding"),
     getAbsolutePath("@storybook/addon-links"),
-    getAbsolutePath("@storybook/addon-essentials"),
     getAbsolutePath("@chromatic-com/storybook"),
-    getAbsolutePath("@storybook/addon-interactions"),
+    getAbsolutePath("@storybook/addon-docs"),
   ],
   framework: {
     name: getAbsolutePath("@storybook/nextjs"),

apps/dashboard/.storybook/preview.tsx

@@ -1,4 +1,4 @@
-import type { Preview } from "@storybook/react";
+import type { Preview } from "@storybook/nextjs";
 import "../src/global.css";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { MoonIcon, SunIcon } from "lucide-react";

apps/dashboard/biome.json

@@ -1,16 +1,4 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.2/schema.json",
-  "extends": ["../../biome.json"],
-  "overrides": [
-    {
-      "include": ["src/css/swagger-ui.css"],
-      "linter": {
-        "rules": {
-          "suspicious": {
-            "noImportantInKeyframe": "off"
-          }
-        }
-      }
-    }
-  ]
+  "$schema": "https://biomejs.dev/schemas/2.0.6/schema.json",
+  "extends": "//"
 }

apps/dashboard/checkly.config.ts

@@ -2,29 +2,29 @@ import { defineConfig } from "checkly";
 import { Frequency } from "checkly/constructs";
 
 export default defineConfig({
-  projectName: "thirdweb.com",
-  logicalId: "thirdweb-www",
-  repoUrl: "https://github.com/thirdweb-dev/dashboard",
   checks: {
     activated: true,
-    muted: false,
-    runtimeId: "2023.09",
-    frequency: Frequency.EVERY_24H,
-    locations: ["us-east-1", "eu-west-1"],
-    tags: ["website"],
+    browserChecks: {
+      frequency: Frequency.EVERY_24H,
+      testMatch: "./tests/**/*.spec.ts",
+    },
     checkMatch: "./**/*.check.ts",
+    frequency: Frequency.EVERY_24H,
     ignoreDirectoriesMatch: [],
+    locations: ["us-east-1", "eu-west-1"],
+    muted: false,
     playwrightConfig: {
       use: {
         baseURL: process.env.ENVIRONMENT_URL || "https://thirdweb.com",
       },
     },
-    browserChecks: {
-      frequency: Frequency.EVERY_24H,
-      testMatch: "./tests/**/*.spec.ts",
-    },
+    runtimeId: "2023.09",
+    tags: ["website"],
   },
   cli: {
     runLocation: "eu-west-1",
   },
+  logicalId: "thirdweb-www",
+  projectName: "thirdweb.com",
+  repoUrl: "https://github.com/thirdweb-dev/dashboard",
 });

apps/dashboard/components.json

@@ -1,17 +1,17 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "default",
-  "rsc": true,
-  "tsx": true,
-  "tailwind": {
-    "config": "tailwind.config.js",
-    "css": "src/global.css",
-    "baseColor": "neutral",
-    "cssVariables": true,
-    "prefix": ""
-  },
   "aliases": {
     "components": "@/components",
     "utils": "@/lib/utils"
-  }
-}
+  },
+  "rsc": true,
+  "style": "default",
+  "tailwind": {
+    "baseColor": "neutral",
+    "config": "tailwind.config.js",
+    "css": "src/global.css",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "tsx": true
+}

apps/dashboard/framer-rewrites.js

@@ -6,31 +6,31 @@ module.exports = [
   "/bounties",
   "/contact-us",
   // -- product landing pages --
-  // -- connect
-  "/connect",
-  "/connect/sign-in",
-  "/connect/account-abstraction",
-  "/connect/universal-bridge",
-  "/connect/auth",
-  "/connect/in-app-wallets",
-  // -- storage
+  // -- build category
+  "/wallets",
+  "/account-abstraction",
+  "/payments",
+  "/auth",
+  "/in-app-wallets",
+  "/transactions",
+  // -- end build category
+
+  // -- scale category
+  "/rpc",
+  "/insight",
   "/storage",
+  // -- end scale category
+
   // -- nebula
   "/nebula",
-  // --insight
-  "/insight",
   // -- contracts
   "/contracts",
   "/contracts/modular-contracts",
   "/contracts/explore",
   "/contracts/deployment-tool",
-  // -- engine
-  "/engine",
+
   // -- solutions pages --
-  "/solutions/gaming",
-  "/solutions/consumer-apps",
-  "/solutions/defi",
-  "/solutions/ecosystem",
+  "/solutions/:solution_slug",
   // -- campaigns --
   // "/unlimited-wallets", -- OFF for now
   // -- TPP --
@@ -43,7 +43,8 @@ module.exports = [
   "/community/ambassadors",
   "/community/startup-program",
   // -- grants --
-  "/grant/superchain",
+  "/grants",
+  "/superchain",
   // -- templates --
   "/templates",
   "/templates/:template_slug",
@@ -61,4 +62,6 @@ module.exports = [
   // -- universal bridge landing pages --
   "/universal-bridge-regions/:region_slug",
   "/enterprise",
+  "/token",
+  "/vault",
 ];

apps/dashboard/knip.json

@@ -1,19 +1,18 @@
 {
   "$schema": "https://unpkg.com/knip@5/schema.json",
-  "next": true,
   "ignore": [
     "src/@/components/ui/**",
-    "src/components/notices/AnnouncementBanner.tsx",
-    "src/components/cmd-k-search/index.tsx",
-    "src/lib/search.ts"
+    "src/@/components/misc/AnnouncementBanner.tsx",
+    "src/@/components/cmd-k-search/index.tsx",
+    "src/@/lib/search.ts"
   ],
-  "project": ["src/**"],
-  "ignoreBinaries": ["only-allow", "biome"],
+  "ignoreBinaries": ["only-allow"],
   "ignoreDependencies": [
-    "@storybook/blocks",
     "@thirdweb-dev/service-utils",
     "@thirdweb-dev/vault-sdk",
     "@types/color",
     "fast-xml-parser"
-  ]
+  ],
+  "next": true,
+  "project": ["src/**"]
 }

apps/dashboard/next-sitemap.config.js

@@ -44,12 +44,37 @@ async function getSingleChain(chainIdOrSlug) {
 
 /** @type {import('next-sitemap').IConfig} */
 module.exports = {
-  siteUrl: process.env.SITE_URL || "https://thirdweb.com",
+  additionalPaths: async (config) => {
+    const [framerUrls, allChains] = await Promise.all([
+      getFramerXML(),
+      fetchChainsFromApi(),
+    ]);
+
+    return [
+      ...framerUrls.map((url) => {
+        return {
+          changefreq: config.changefreq,
+          lastmod: config.autoLastmod ? new Date().toISOString() : undefined,
+          loc: url.loc,
+          priority: config.priority,
+        };
+      }),
+      ...allChains.map((chain) => {
+        return {
+          changefreq: config.changefreq,
+          lastmod: config.autoLastmod ? new Date().toISOString() : undefined,
+          loc: `/${chain.slug}`,
+          priority: config.priority,
+        };
+      }),
+      ...(await createSearchRecordSitemaps(config)),
+    ];
+  },
+  exclude: ["/chain/validate"],
   generateRobotsTxt: true,
   robotsTxtOptions: {
     policies: [
       {
-        userAgent: "*",
         // allow all if production
         allow: process.env.VERCEL_ENV === "production" ? ["/"] : [],
         // disallow all if not production
@@ -58,10 +83,11 @@ module.exports = {
             ? ["/"]
             : // disallow `/team` and `/team/*` if production
               ["/team", "/team/*"],
+        userAgent: "*",
       },
     ],
   },
-  exclude: ["/chain/validate"],
+  siteUrl: process.env.SITE_URL || "https://thirdweb.com",
   transform: async (config, _path) => {
     let path = _path;
 
@@ -75,40 +101,14 @@ module.exports = {
       path = path.replace("deployer.thirdweb.eth", "thirdweb.eth");
     }
     return {
+      alternateRefs: config.alternateRefs ?? [],
+      changefreq: config.changefreq,
+      lastmod: config.autoLastmod ? new Date().toISOString() : undefined,
       // => this will be exported as http(s)://<config.siteUrl>/<path>
       loc: path,
-      changefreq: config.changefreq,
       priority: config.priority,
-      lastmod: config.autoLastmod ? new Date().toISOString() : undefined,
-      alternateRefs: config.alternateRefs ?? [],
     };
   },
-  additionalPaths: async (config) => {
-    const [framerUrls, allChains] = await Promise.all([
-      getFramerXML(),
-      fetchChainsFromApi(),
-    ]);
-
-    return [
-      ...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}`,
-          changefreq: config.changefreq,
-          priority: config.priority,
-          lastmod: config.autoLastmod ? new Date().toISOString() : undefined,
-        };
-      }),
-      ...(await createSearchRecordSitemaps(config)),
-    ];
-  },
 };
 /**
  * @param {{ changefreq?: any; priority?: any; autoLastmod?: any; }} config
@@ -131,10 +131,10 @@ async function createSearchRecordSitemaps(config) {
     parsedLines.map((parsedLine) => {
       return getSingleChain(parsedLine.chain_id)
         .then((parsedLineChain) => ({
-          loc: `/${parsedLineChain.slug}/${parsedLine.contract_address}`,
           changefreq: config.changefreq,
-          priority: config.priority,
           lastmod: config.autoLastmod ? new Date().toISOString() : undefined,
+          loc: `/${parsedLineChain.slug}/${parsedLine.contract_address}`,
+          priority: config.priority,
         }))
         .catch(() => null);
     }),

apps/dashboard/next.config.ts

@@ -12,7 +12,7 @@ const ContentSecurityPolicy = `
   style-src 'self' 'unsafe-inline' vercel.live;
   font-src 'self' vercel.live assets.vercel.com framerusercontent.com fonts.gstatic.com;
   frame-src * data:;
-  script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' 'inline-speculation-rules' *.thirdweb.com *.thirdweb-dev.com vercel.live js.stripe.com framerusercontent.com events.framer.com challenges.cloudflare.com;
+  script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' 'inline-speculation-rules' *.thirdweb.com *.thirdweb-dev.com vercel.live js.stripe.com framerusercontent.com events.framer.com challenges.cloudflare.com googletagmanager.com us-assets.i.posthog.com edit.framer.com;
   connect-src * data: blob:;
   worker-src 'self' blob:;
   block-all-mixed-content;
@@ -46,91 +46,90 @@ function determineIpfsGateways() {
   const remotePatterns: RemotePattern[] = [];
   if (process.env.API_ROUTES_CLIENT_ID) {
     remotePatterns.push({
-      protocol: "https",
       hostname: `${process.env.API_ROUTES_CLIENT_ID}.ipfscdn.io`,
+      protocol: "https",
     });
     remotePatterns.push({
-      protocol: "https",
       hostname: `${process.env.API_ROUTES_CLIENT_ID}.thirdwebstorage-staging.com`,
+      protocol: "https",
     });
     remotePatterns.push({
-      protocol: "https",
       hostname: `${process.env.API_ROUTES_CLIENT_ID}.thirdwebstorage-dev.com`,
+      protocol: "https",
     });
   } else {
     // this should only happen in development
     remotePatterns.push({
-      protocol: "https",
       hostname: "ipfs.io",
+      protocol: "https",
     });
   }
   // also add the dashboard clientId ipfs gateway if it is set
   if (process.env.NEXT_PUBLIC_DASHBOARD_CLIENT_ID) {
     remotePatterns.push({
-      protocol: "https",
       hostname: `${process.env.NEXT_PUBLIC_DASHBOARD_CLIENT_ID}.ipfscdn.io`,
+      protocol: "https",
     });
     remotePatterns.push({
-      protocol: "https",
       hostname: `${process.env.NEXT_PUBLIC_DASHBOARD_CLIENT_ID}.thirdwebstorage-staging.com`,
+      protocol: "https",
     });
     remotePatterns.push({
-      protocol: "https",
       hostname: `${process.env.NEXT_PUBLIC_DASHBOARD_CLIENT_ID}.thirdwebstorage-dev.com`,
+      protocol: "https",
     });
   }
   return remotePatterns;
 }
 
 const SENTRY_OPTIONS: SentryBuildOptions = {
-  // For all available options, see:
-  // https://github.com/getsentry/sentry-webpack-plugin#options
-
-  org: "thirdweb-dev",
-  project: "dashboard",
   // An auth token is required for uploading source maps.
   authToken: process.env.SENTRY_AUTH_TOKEN,
-  // Suppresses source map uploading logs during build
-  silent: true,
-  // For all available options, see:
-  // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
-
-  // Upload a larger set of source maps for prettier stack traces (increases build time)
-  widenClientFileUpload: true,
-
-  // Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers (increases server load)
-  tunnelRoute: "/err",
-
-  // Automatically tree-shake Sentry logger statements to reduce bundle size
-  disableLogger: true,
 
   // Enables automatic instrumentation of Vercel Cron Monitors.
   // See the following for more information:
   // https://docs.sentry.io/product/crons/
   // https://vercel.com/docs/cron-jobs
   automaticVercelMonitors: false,
+
+  // Automatically tree-shake Sentry logger statements to reduce bundle size
+  disableLogger: true,
+  // For all available options, see:
+  // https://github.com/getsentry/sentry-webpack-plugin#options
+
+  org: "thirdweb-dev",
+  project: "dashboard",
+  // Suppresses source map uploading logs during build
+  silent: true,
+
+  // Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers (increases server load)
+  tunnelRoute: "/err",
+  // For all available options, see:
+  // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
+
+  // Upload a larger set of source maps for prettier stack traces (increases build time)
+  widenClientFileUpload: true,
 };
 
 // add additional languages to the framer rewrite paths here (english is already included by default)
 const FRAMER_ADDITIONAL_LANGUAGES = ["es"];
 
 const baseNextConfig: NextConfig = {
+  compiler: {
+    emotion: true,
+  },
   eslint: {
     ignoreDuringBuilds: true,
   },
-  productionBrowserSourceMaps: false,
   experimental: {
-    webpackBuildWorker: true,
-    webpackMemoryOptimizations: true,
     serverSourceMaps: false,
     taint: true,
+    webpackBuildWorker: true,
+    webpackMemoryOptimizations: true,
   },
-  serverExternalPackages: ["pino-pretty"],
   async headers() {
     return [
       {
-        // Apply these headers to all routes in your application.
-        source: "/(.*)",
         headers: [
           ...securityHeaders,
           {
@@ -138,56 +137,69 @@ const baseNextConfig: NextConfig = {
             value: "sec-ch-viewport-width",
           },
         ],
+        // Apply these headers to all routes in your application.
+        source: "/(.*)",
       },
     ];
   },
+  images: {
+    contentSecurityPolicy: "default-src 'self'; script-src 'none'; sandbox;",
+    dangerouslyAllowSVG: true,
+    remotePatterns: [
+      {
+        hostname: "**.thirdweb.com",
+        protocol: "https",
+      },
+      ...determineIpfsGateways(),
+    ],
+  },
+  productionBrowserSourceMaps: false,
+  reactStrictMode: true,
   async redirects() {
     return getRedirects();
   },
   async rewrites() {
     return [
       {
-        source: "/thirdweb.eth",
-        destination: "/deployer.thirdweb.eth",
+        destination: "https://us-assets.i.posthog.com/static/:path*",
+        source: "/_ph/static/:path*",
+      },
+      {
+        destination: "https://us.i.posthog.com/:path*",
+        source: "/_ph/:path*",
+      },
+      {
+        destination: "https://us.i.posthog.com/decide",
+        source: "/_ph/decide",
+      },
+      {
+        destination: "/deployer.thirdweb.eth",
+        source: "/thirdweb.eth",
       },
       {
-        source: "/thirdweb.eth/:path*",
         destination: "/deployer.thirdweb.eth/:path*",
+        source: "/thirdweb.eth/:path*",
       },
       // re-write /home to / (this is so that logged in users will be able to go to /home and NOT be redirected to the logged in app)
       {
-        source: "/home",
         destination: "https://landing.thirdweb.com",
+        source: "/home",
       },
       // flatmap the framer paths for the default language and the additional languages
       ...FRAMER_PATHS.flatMap((path) => [
         {
-          source: path,
           destination: `https://landing.thirdweb.com${path}`,
+          source: path,
         },
         // this is for additional languages
         ...FRAMER_ADDITIONAL_LANGUAGES.map((lang) => ({
-          source: `/${lang}${path}`,
           destination: `https://landing.thirdweb.com/${lang}${path}`,
+          source: `/${lang}${path}`,
         })),
       ]),
     ];
   },
-  images: {
-    dangerouslyAllowSVG: true,
-    contentSecurityPolicy: "default-src 'self'; script-src 'none'; sandbox;",
-    remotePatterns: [
-      {
-        protocol: "https",
-        hostname: "**.thirdweb.com",
-      },
-      ...determineIpfsGateways(),
-    ],
-  },
-  compiler: {
-    emotion: true,
-  },
-  reactStrictMode: true,
+  serverExternalPackages: ["pino-pretty"],
 };
 
 function getConfig(): NextConfig {
@@ -196,35 +208,29 @@ function getConfig(): NextConfig {
     const withBundleAnalyzer = require("@next/bundle-analyzer")({
       enabled: process.env.ANALYZE === "true",
     });
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const { withPlausibleProxy } = require("next-plausible");
+
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const { withSentryConfig } = require("@sentry/nextjs");
     return withBundleAnalyzer(
-      withPlausibleProxy({
-        customDomain: "https://pl.thirdweb.com",
-        scriptName: "pl",
-      })(
-        withSentryConfig(
-          {
-            ...baseNextConfig,
-            // @ts-expect-error - this is a valid option
-            webpack: (config) => {
-              if (config.cache) {
-                config.cache = Object.freeze({
-                  type: "memory",
-                });
-              }
-              config.module = {
-                ...config.module,
-                exprContextCritical: false,
-              };
-              // Important: return the modified config
-              return config;
-            },
+      withSentryConfig(
+        {
+          ...baseNextConfig,
+          // @ts-expect-error - this is a valid option
+          webpack: (config) => {
+            if (config.cache) {
+              config.cache = Object.freeze({
+                type: "memory",
+              });
+            }
+            config.module = {
+              ...config.module,
+              exprContextCritical: false,
+            };
+            // Important: return the modified config
+            return config;
           },
-          SENTRY_OPTIONS,
-        ),
+        },
+        SENTRY_OPTIONS,
       ),
     );
   }

apps/dashboard/package.json

@@ -1,58 +1,37 @@
 {
-  "name": "thirdweb-dashboard",
-  "version": "3.0.0",
-  "private": true,
-  "scripts": {
-    "preinstall": "npx only-allow pnpm",
-    "dev": "next dev --turbopack",
-    "build": "NODE_OPTIONS=--max-old-space-size=6144 next build",
-    "start": "next start",
-    "format": "biome format ./src --write",
-    "lint": "biome check ./src && knip && eslint ./src",
-    "fix": "biome check ./src --fix && eslint ./src --fix",
-    "typecheck": "tsc --noEmit",
-    "gen:theme-typings": "chakra-cli tokens src/theme/index.ts",
-    "postinstall": "pnpm run gen:theme-typings",
-    "postbuild": "next-sitemap",
-    "build:analyze": "ANALYZE=true pnpm run build",
-    "knip": "knip",
-    "playwright": "playwright test",
-    "update-checkly": "npx checkly deploy",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
-  },
   "dependencies": {
     "@chakra-ui/react": "^2.8.2",
     "@chakra-ui/styled-system": "^2.9.2",
     "@chakra-ui/theme-tools": "^2.1.2",
     "@emotion/react": "11.14.0",
-    "@emotion/styled": "11.14.0",
+    "@emotion/styled": "11.14.1",
     "@hookform/resolvers": "^3.9.1",
     "@marsidev/react-turnstile": "^1.1.0",
-    "@radix-ui/react-accordion": "^1.2.7",
-    "@radix-ui/react-alert-dialog": "^1.1.10",
-    "@radix-ui/react-avatar": "^1.1.6",
-    "@radix-ui/react-checkbox": "^1.2.2",
-    "@radix-ui/react-dialog": "1.1.10",
-    "@radix-ui/react-dropdown-menu": "^2.1.11",
-    "@radix-ui/react-hover-card": "^1.1.10",
-    "@radix-ui/react-label": "^2.1.4",
-    "@radix-ui/react-popover": "^1.1.10",
-    "@radix-ui/react-progress": "^1.1.4",
-    "@radix-ui/react-radio-group": "^1.3.3",
-    "@radix-ui/react-select": "^2.2.2",
-    "@radix-ui/react-separator": "^1.1.4",
-    "@radix-ui/react-slot": "^1.2.0",
-    "@radix-ui/react-switch": "^1.2.2",
-    "@radix-ui/react-tooltip": "1.2.3",
-    "@scalar/api-reference-react": "^0.6.19",
-    "@sentry/nextjs": "9.13.0",
-    "@shazow/whatsabi": "0.21.0",
-    "@tanstack/react-query": "5.74.4",
+    "@radix-ui/react-accordion": "^1.2.11",
+    "@radix-ui/react-alert-dialog": "^1.1.14",
+    "@radix-ui/react-avatar": "^1.1.10",
+    "@radix-ui/react-checkbox": "^1.3.2",
+    "@radix-ui/react-collapsible": "^1.1.11",
+    "@radix-ui/react-dialog": "1.1.14",
+    "@radix-ui/react-dropdown-menu": "^2.1.15",
+    "@radix-ui/react-hover-card": "^1.1.14",
+    "@radix-ui/react-label": "^2.1.7",
+    "@radix-ui/react-popover": "^1.1.14",
+    "@radix-ui/react-progress": "^1.1.7",
+    "@radix-ui/react-radio-group": "^1.3.7",
+    "@radix-ui/react-select": "^2.2.5",
+    "@radix-ui/react-separator": "^1.1.7",
+    "@radix-ui/react-slot": "^1.2.3",
+    "@radix-ui/react-switch": "^1.2.5",
+    "@radix-ui/react-tooltip": "1.2.7",
+    "@scalar/api-reference-react": "0.7.25",
+    "@sentry/nextjs": "9.34.0",
+    "@shazow/whatsabi": "0.22.2",
+    "@tanstack/react-query": "5.81.5",
     "@tanstack/react-table": "^8.21.3",
     "@thirdweb-dev/service-utils": "workspace:*",
     "@thirdweb-dev/vault-sdk": "workspace:*",
-    "@vercel/functions": "2.0.0",
+    "@vercel/functions": "2.2.2",
     "@vercel/og": "^0.6.8",
     "abitype": "1.0.8",
     "chakra-react-select": "^4.7.6",
@@ -61,90 +40,106 @@
     "color": "5.0.0",
     "compare-versions": "^6.1.0",
     "date-fns": "4.1.0",
-    "fast-xml-parser": "^5.2.1",
-    "fetch-event-stream": "0.1.5",
-    "flat": "^6.0.1",
-    "framer-motion": "12.9.2",
+    "fast-xml-parser": "^5.2.5",
+    "framer-motion": "12.23.0",
     "fuse.js": "7.1.0",
-    "idb-keyval": "^6.2.1",
     "input-otp": "^1.4.1",
     "ioredis": "^5.6.1",
     "ipaddr.js": "^2.2.0",
-    "lucide-react": "0.503.0",
-    "next": "15.3.1",
-    "next-plausible": "^3.12.4",
+    "lucide-react": "0.525.0",
+    "next": "15.3.5",
     "next-themes": "^0.4.6",
     "nextjs-toploader": "^1.6.12",
     "nuqs": "^2.4.3",
     "p-limit": "^6.2.0",
-    "papaparse": "^5.5.2",
+    "papaparse": "^5.5.3",
     "pluralize": "^8.0.0",
-    "posthog-js": "1.67.1",
-    "prettier": "3.5.3",
+    "posthog-js": "1.256.1",
+    "posthog-node": "^5.4.0",
+    "prettier": "3.6.2",
     "qrcode": "^1.5.3",
     "react": "19.1.0",
     "react-children-utilities": "^2.10.0",
     "react-day-picker": "^8.10.1",
     "react-dom": "19.1.0",
     "react-dropzone": "^14.3.8",
-    "react-error-boundary": "^5.0.0",
+    "react-error-boundary": "6.0.0",
     "react-hook-form": "7.55.0",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "10.1.0",
     "react-table": "^7.8.0",
     "recharts": "2.15.3",
     "remark-gfm": "4.0.1",
     "responsive-rsc": "0.0.7",
     "server-only": "^0.0.1",
     "shiki": "1.27.0",
-    "sonner": "2.0.3",
+    "sonner": "2.0.6",
     "spdx-correct": "^3.2.0",
     "stripe": "17.7.0",
-    "swagger-ui-react": "^5.21.0",
+    "swagger-ui-react": "^5.24.1",
     "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
     "thirdweb": "workspace:*",
     "tiny-invariant": "^1.3.3",
-    "use-debounce": "^10.0.4",
-    "zod": "3.24.3"
+    "use-debounce": "^10.0.5",
+    "vaul": "^1.1.2",
+    "zod": "3.25.75"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.6",
     "@chakra-ui/cli": "^2.4.1",
-    "@chromatic-com/storybook": "3.2.6",
-    "@next/bundle-analyzer": "15.3.1",
-    "@next/eslint-plugin-next": "15.3.1",
-    "@playwright/test": "1.52.0",
-    "@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",
+    "@chromatic-com/storybook": "4.0.1",
+    "@next/bundle-analyzer": "15.3.5",
+    "@next/eslint-plugin-next": "15.3.5",
+    "@playwright/test": "1.53.2",
+    "@storybook/addon-docs": "9.0.15",
+    "@storybook/addon-links": "9.0.15",
+    "@storybook/addon-onboarding": "9.0.15",
+    "@storybook/nextjs": "9.0.15",
     "@types/color": "4.2.0",
     "@types/node": "22.14.1",
-    "@types/papaparse": "^5.3.15",
+    "@types/papaparse": "^5.3.16",
     "@types/pluralize": "^0.0.33",
     "@types/qrcode": "^1.5.5",
-    "@types/react": "19.1.2",
-    "@types/react-dom": "19.1.2",
+    "@types/react": "19.1.8",
+    "@types/react-dom": "19.1.6",
     "@types/react-table": "^7.7.20",
     "@types/spdx-correct": "^3.1.3",
     "@types/swagger-ui-react": "^5.18.0",
     "@typescript-eslint/eslint-plugin": "7.14.1",
     "@typescript-eslint/parser": "7.14.1",
     "autoprefixer": "^10.4.21",
-    "checkly": "5.2.0",
+    "checkly": "6.0.1",
     "eslint": "8.57.0",
     "eslint-config-biome": "1.9.4",
-    "eslint-plugin-react-compiler": "19.0.0-beta-e993439-20250405",
-    "eslint-plugin-storybook": "0.12.0",
-    "knip": "5.50.5",
+    "eslint-plugin-react-compiler": "19.1.0-rc.2",
+    "eslint-plugin-storybook": "9.0.15",
+    "knip": "5.60.2",
     "next-sitemap": "^4.2.3",
-    "postcss": "8.5.3",
-    "storybook": "8.6.12",
+    "postcss": "8.5.6",
+    "storybook": "9.0.15",
     "tailwindcss": "3.4.17",
     "typescript": "5.8.3"
-  }
+  },
+  "name": "thirdweb-dashboard",
+  "private": true,
+  "scripts": {
+    "build": "NODE_OPTIONS=--max-old-space-size=6144 next build",
+    "build-storybook": "storybook build",
+    "build:analyze": "ANALYZE=true pnpm run build",
+    "dev": "next dev --turbopack",
+    "fix": "biome check ./src --fix && eslint ./src --fix",
+    "format": "biome format ./src --write",
+    "gen:theme-typings": "chakra-cli tokens src/chakra/theme/index.ts",
+    "knip": "knip",
+    "lint": "biome check ./src && knip && eslint ./src",
+    "playwright": "playwright test",
+    "postbuild": "next-sitemap",
+    "postinstall": "pnpm run gen:theme-typings",
+    "preinstall": "npx only-allow pnpm",
+    "start": "next start",
+    "storybook": "storybook dev -p 6006",
+    "typecheck": "tsc --noEmit",
+    "update-checkly": "npx checkly deploy"
+  },
+  "version": "3.0.0"
 }

apps/dashboard/playwright.config.ts

@@ -10,25 +10,10 @@ import { defineConfig, devices } from "@playwright/test";
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-  testDir: "./tests",
-  /* Run tests in files in parallel */
-  fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: "html",
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: process.env.ENVIRONMENT_URL || "http://127.0.0.1:3000",
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: "on-first-retry",
-  },
+  /* Run tests in files in parallel */
+  fullyParallel: true,
 
   /* Configure projects for major browsers */
   projects: [
@@ -67,13 +52,28 @@ export default defineConfig({
     //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
     // },
   ],
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: "html",
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  testDir: "./tests",
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: process.env.ENVIRONMENT_URL || "http://127.0.0.1:3000",
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: "on-first-retry",
+  },
 
   /* Run your local dev server before starting the tests */
   webServer: process.env.CI
     ? undefined
     : {
         command: "pnpm run start",
-        url: "http://127.0.0.1:3000",
         reuseExistingServer: !process.env.CI,
+        url: "http://127.0.0.1:3000",
       },
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
 });

apps/dashboard/postcss.config.js

@@ -1,6 +1,6 @@
 module.exports = {
   plugins: {
-    tailwindcss: {},
     autoprefixer: {},
+    tailwindcss: {},
   },
 };

apps/dashboard/public/assets/support/account.svg

@@ -1,3 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.33106 4.3C8.33109 4.3 7.52045 5.11064 7.52045 6.11061C7.52045 7.11058 8.33109 7.92121 9.33106 7.92121C10.331 7.92121 11.1417 7.11058 11.1417 6.11061C11.1417 5.11064 10.331 4.3 9.33106 4.3ZM5.22045 6.11061C5.22045 3.84038 7.06084 2 9.33106 2C11.6013 2 13.4417 3.84038 13.4417 6.11061C13.4417 8.38083 11.6013 10.2212 9.33106 10.2212C7.06084 10.2212 5.22045 8.38083 5.22045 6.11061ZM4.20397 12.0858C4.97486 11.3149 6.0204 10.8818 7.11061 10.8818H11.5515C12.6417 10.8818 13.6873 11.3149 14.4581 12.0858C14.9073 12.5349 14.9073 13.263 14.4581 13.7121C14.009 14.1612 13.2809 14.1612 12.8318 13.7121C12.4922 13.3726 12.0317 13.1818 11.5515 13.1818H7.11061C6.6304 13.1818 6.16987 13.3726 5.83031 13.7121C5.49076 14.0517 5.3 14.5122 5.3 14.9924V16.4727C5.3 17.1079 4.78513 17.6227 4.15 17.6227C3.51487 17.6227 3 17.1079 3 16.4727V14.9924C3 13.9022 3.43308 12.8567 4.20397 12.0858ZM17.5457 14.9598C17.9948 14.5107 17.9948 13.7825 17.5457 13.3334C17.0966 12.8843 16.3685 12.8843 15.9194 13.3334L13.7719 15.4808L13.1048 14.8137C12.6557 14.3646 11.9276 14.3646 11.4785 14.8137C11.0294 15.2628 11.0294 15.991 11.4785 16.4401L12.9588 17.9204C13.4079 18.3695 14.136 18.3695 14.5851 17.9204L17.5457 14.9598Z" fill="#646D7A"/>
-</svg>

apps/dashboard/public/assets/support/misc.svg

@@ -1,4 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M15.4444 3H4.55556C3.69645 3 3 3.69645 3 4.55556V15.4444C3 16.3036 3.69645 17 4.55556 17H15.4444C16.3036 17 17 16.3036 17 15.4444V4.55556C17 3.69645 16.3036 3 15.4444 3Z" stroke="#646D7A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M12.3333 7.66666L7.66663 12.3333" stroke="#646D7A" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

apps/dashboard/redirects.js

@@ -1,64 +1,132 @@
 const legacyDashboardToTeamRedirects = [
   {
-    source: "/dashboard",
     destination: "/team",
     permanent: false,
+    source: "/dashboard",
   },
   {
-    source: "/dashboard/contracts/:path*",
     destination: "/team/~/~/contracts",
     permanent: false,
+    source: "/dashboard/contracts/:path*",
   },
   {
-    source: "/dashboard/connect/ecosystem/:path*",
     destination: "/team/~/~/ecosystem/:path*",
     permanent: false,
+    source: "/dashboard/connect/ecosystem/:path*",
   },
   {
-    source: "/dashboard/engine/:path*",
     destination: "/team/~/~/engine/:path*",
     permanent: false,
+    source: "/dashboard/engine/:path*",
   },
   {
-    source: "/dashboard/settings/api-keys",
     destination: "/team",
     permanent: false,
+    source: "/dashboard/settings/api-keys",
   },
   {
-    source: "/dashboard/settings/devices",
     destination: "/account/devices",
     permanent: false,
+    source: "/dashboard/settings/devices",
   },
   {
-    source: "/dashboard/settings/billing",
     destination: "/team/~/~/settings/billing",
     permanent: false,
+    source: "/dashboard/settings/billing",
   },
   {
-    source: "/dashboard/settings/gas-credits",
     destination: "/team/~/~/settings/credits",
     permanent: false,
+    source: "/dashboard/settings/gas-credits",
   },
   {
-    source: "/dashboard/settings/usage",
     destination: "/team/~/~/usage",
     permanent: false,
+    source: "/dashboard/settings/usage",
   },
   {
-    source: "/dashboard/settings/storage",
     destination: "/team/~/~/usage/storage",
     permanent: false,
+    source: "/dashboard/settings/storage",
   },
   {
-    source: "/dashboard/settings/notifications",
     destination: "/team/~/~/settings/notifications",
     permanent: false,
+    source: "/dashboard/settings/notifications",
   },
   // rest of the /dashboard/* routes
   {
-    source: "/dashboard/:path*",
     destination: "/team",
     permanent: false,
+    source: "/dashboard/:path*",
+  },
+];
+
+const projectRoute = "/team/:team_slug/:project_slug";
+
+const projectPageRedirects = [
+  {
+    destination: `${projectRoute}/universal-bridge/:path*`,
+    permanent: false,
+    source: `${projectRoute}/connect/pay/:path*`,
+  },
+  {
+    destination: `${projectRoute}/universal-bridge/:path*`,
+    permanent: false,
+    source: `${projectRoute}/connect/universal-bridge/:path*`,
+  },
+  {
+    destination: `${projectRoute}/account-abstraction/:path*`,
+    permanent: false,
+    source: `${projectRoute}/connect/account-abstraction/:path*`,
+  },
+  {
+    destination: `${projectRoute}/wallets/:path*`,
+    permanent: false,
+    source: `${projectRoute}/connect/in-app-wallets/:path*`,
+  },
+  {
+    destination: `${projectRoute}/vault/:path*`,
+    permanent: false,
+    source: `${projectRoute}/engine/cloud/vault/:path*`,
+  },
+  {
+    destination: `${projectRoute}/transactions/:path*`,
+    permanent: false,
+    source: `${projectRoute}/engine/cloud/:path*`,
+  },
+  {
+    destination: `${projectRoute}/tokens/:path*`,
+    permanent: false,
+    source: `${projectRoute}/assets/:path*`,
+  },
+  {
+    destination: projectRoute,
+    permanent: false,
+    source: `${projectRoute}/nebula/:path*`,
+  },
+  {
+    destination: `${projectRoute}`,
+    permanent: false,
+    source: `${projectRoute}/connect/analytics`,
+  },
+];
+
+const teamPageRedirects = [
+  {
+    destination: "/team/:team_slug/~/billing/:path*",
+    permanent: false,
+    source: "/team/:team_slug/~/settings/billing/:path*",
+  },
+  {
+    destination: "/team/:team_slug/~/billing/invoices/:path*",
+    permanent: false,
+    source: "/team/:team_slug/~/settings/invoices/:path*",
+  },
+  {
+    destination: "/team/:team_slug/~/billing",
+    permanent: false,
+    source: "/team/:team_slug/~/settings/credits",
   },
 ];
 
@@ -66,310 +134,325 @@ const legacyDashboardToTeamRedirects = [
 async function redirects() {
   return [
     {
-      source: "/portal/:match*",
       destination: "https://portal.thirdweb.com/:match*",
       permanent: true,
+      source: "/portal/:match*",
     },
     {
-      source: "/solutions/appchain-api",
       destination: "/solutions/chains",
       permanent: true,
+      source: "/solutions/appchain-api",
     },
     {
-      source: "/contracts/release",
       destination: "/contracts/publish",
       permanent: false,
+      source: "/contracts/release",
     },
     {
-      source: "/contracts/release/:path*",
       destination: "/contracts/publish/:path*",
       permanent: false,
+      source: "/contracts/release/:path*",
     },
     {
-      source: "/release",
       destination: "/publish",
       permanent: false,
+      source: "/release",
     },
     {
-      source: "/release/:path*",
       destination: "/publish/:path*",
       permanent: false,
+      source: "/release/:path*",
     },
     {
-      source: "/authentication",
       destination: "/auth",
       permanent: false,
+      source: "/authentication",
     },
     {
-      source: "/extensions",
       destination: "/build",
       permanent: false,
+      source: "/extensions",
     },
     {
-      source: "/contractkit",
       destination: "/build",
       permanent: true,
+      source: "/contractkit",
     },
     //  old (deprecated) routes
     {
-      source:
-        "/:network/(edition|nft-collection|token|nft-drop|signature-drop|edition-drop|token-drop|vote)/:address",
       destination: "/:network/:address",
       permanent: false,
+      source:
+        "/:network/(edition|nft-collection|token|nft-drop|signature-drop|edition-drop|token-drop|vote)/:address",
     },
     // prebuilt contract deploys
     {
-      source: "/contracts/new/:slug*",
       destination: "/explore",
       permanent: false,
+      source: "/contracts/new/:slug*",
     },
     // deployer to non-deployer url
     // handled directly in SSR as well
     {
-      source: "/deployer.thirdweb.eth",
       destination: "/thirdweb.eth",
       permanent: true,
+      source: "/deployer.thirdweb.eth",
     },
     {
-      source: "/deployer.thirdweb.eth/:path*",
       destination: "/thirdweb.eth/:path*",
       permanent: true,
+      source: "/deployer.thirdweb.eth/:path*",
     },
     {
-      source: "/chains",
       destination: "/chainlist",
       permanent: true,
+      source: "/chains",
     },
     // polygon zkevm beta to non-beta
     {
-      source: "/polygon-zkevm-beta",
       destination: "/polygon-zkevm",
       permanent: false,
+      source: "/polygon-zkevm-beta",
     },
     // backwards compat: page moved to pages/settings/devices
 
     {
-      source: "/template/nft-drop",
       destination: "/template/erc721",
       permanent: false,
+      source: "/template/nft-drop",
     },
     {
+      destination: "/team",
+      permanent: false,
       source: "/create-api-key",
-      destination: "/team",
-      permanent: false,
     },
     {
+      destination: "/team",
+      permanent: false,
       source: "/dashboard/settings",
-      destination: "/team",
-      permanent: false,
     },
     {
-      source: "/dashboard/connect/playground",
       destination: "https://playground.thirdweb.com/connect/sign-in/button",
       permanent: false,
+      source: "/dashboard/connect/playground",
     },
     {
-      source: "/dashboard/infrastructure/storage",
       destination: "/dashboard/settings/storage",
       permanent: false,
+      source: "/dashboard/infrastructure/storage",
     },
     {
-      source: "/dashboard/infrastructure/rpc-edge",
       destination: "/chainlist",
       permanent: false,
+      source: "/dashboard/infrastructure/rpc-edge",
     },
     {
-      source: "/solutions/commerce",
       destination: "/solutions/loyalty",
       permanent: false,
+      source: "/solutions/commerce",
     },
     {
-      source: "/hackathon/base-consumer-crypto",
       destination: "/hackathon/consumer-crypto",
       permanent: false,
+      source: "/hackathon/base-consumer-crypto",
     },
     {
-      source: "/bear-market-airdrop",
       destination: "/",
       permanent: false,
+      source: "/bear-market-airdrop",
     },
     {
-      source: "/drops/optimism",
       destination: "/optimism",
       permanent: false,
+      source: "/drops/optimism",
     },
     // Redirecting as ambassadors lives in community now
     {
-      source: "/ambassadors",
       destination: "/community/ambassadors",
       permanent: false,
+      source: "/ambassadors",
     },
     {
-      source: "/embedded-wallets",
       destination: "/in-app-wallets",
       permanent: false,
+      source: "/embedded-wallets",
     },
     // temporarily redirect cli login to support page
     {
-      source: "/cli/login",
       destination:
-        "https://support.thirdweb.com/troubleshooting-errors/7Y1BqKNvtLdBv5fZkRZZB3/issue-linking-device-on-the-authorization-page-via-thirdweb-cli/cn9LRA3ax7XCP6uxwRYdvx",
+        "https://portal.thirdweb.com/knowledge-base/onchain-common-errors/thirdweb-cli/device-link-error",
       permanent: false,
+      source: "/cli/login",
     },
 
     // temporary redirect gas -> explore page
     {
-      source: "/gas",
       destination: "/explore",
       permanent: false,
+      source: "/gas",
     },
     {
+      destination: "/contracts/deployment-tool",
+      permanent: false,
       source: "/deploy",
-      destination: "/contracts/deployment-tool",
-      permanent: false,
     },
     {
+      destination: "/contracts/deployment-tool",
+      permanent: false,
       source: "/publish",
-      destination: "/contracts/deployment-tool",
-      permanent: false,
     },
     {
-      source: "/smart-contracts",
       destination: "/contracts/explore",
       permanent: false,
+      source: "/smart-contracts",
     },
     {
-      source: "/build",
-      destination: "/contracts/modular-contracts",
+      destination: "/sdk",
       permanent: false,
-    },
-    {
       source: "/ui-components",
-      destination: "/sdk",
-      permanent: false,
     },
     {
+      destination: "/sdk",
+      permanent: false,
       source: "/interact",
-      destination: "/sdk",
-      permanent: false,
     },
     {
-      source: "/sponsored-transactions",
       destination: "/account-abstraction",
       permanent: false,
+      source: "/sponsored-transactions",
     },
     // redirect /solutions/chains to /solutions/ecosystem
     {
-      source: "/solutions/chains",
       destination: "/solutions/ecosystem",
       permanent: false,
-    },
-    // redirect /rpc to portal
-    {
-      source: "/rpc-edge",
-      destination:
-        "https://portal.thirdweb.com/infrastructure/rpc-edge/overview",
-      permanent: false,
+      source: "/solutions/chains",
     },
     // redirect /sdk to portal
     {
-      source: "/sdk",
       destination: "https://portal.thirdweb.com/connect/blockchain-api",
       permanent: false,
+      source: "/sdk",
     },
     // redirect `/events` to homepage
     {
-      source: "/events",
       destination: "/",
       permanent: false,
+      source: "/events",
     },
     // redirect /community to /community/ambassadors
     {
-      source: "/community",
       destination: "/community/ambassadors",
       permanent: false,
+      source: "/community",
     },
     // redirect `/tos` to `/terms`
     {
-      source: "/tos",
       destination: "/terms",
       permanent: false,
+      source: "/tos",
     },
     // redirect `/privacy` to `/privacy-policy`
     {
-      source: "/privacy",
       destination: "/privacy-policy",
       permanent: false,
+      source: "/privacy",
     },
     // redirect `/mission` to `/home`
     {
-      source: "/mission",
       destination: "/home",
       permanent: false,
+      source: "/mission",
     },
     // redirect "/open-source" to "/bounties"
     {
-      source: "/open-source",
       destination: "/bounties",
       permanent: false,
+      source: "/open-source",
     },
     // redirect /template/<slug> to /templates/<slug>
     {
-      source: "/template/:slug",
       destination: "/templates/:slug",
       permanent: false,
+      source: "/template/:slug",
     },
-    // redirect /account-abstraction to /connect/account-abstraction
+    // redirect /connect/pay to /universal-bridge
     {
-      source: "/account-abstraction",
-      destination: "/connect/account-abstraction",
+      destination: "/universal-bridge",
       permanent: false,
-    },
-    // redirect /connect/pay to /connect/universal-bridge
-    {
       source: "/connect/pay",
-      destination: "/connect/universal-bridge",
-      permanent: false,
-    },
-    // redirect /auth to /connect/auth
-    {
-      source: "/auth",
-      destination: "/connect/auth",
-      permanent: false,
-    },
-    // redirect /in-app-wallets to /connect/in-app-wallets
-    {
-      source: "/in-app-wallets",
-      destination: "/connect/in-app-wallets",
-      permanent: false,
     },
     // PREVIOUS CAMPAIGNS
     {
-      source: "/unlimited-wallets",
       destination: "/",
       permanent: false,
+      source: "/unlimited-wallets",
     },
-    // pay > universal-bridge redirect
-    {
-      source: "/team/:team_slug/:project_slug/connect/pay/:path*",
-      destination:
-        "/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/:path*",
     },
     {
-      source: "/learn/tutorials",
       destination: "/learn/guides",
       permanent: false,
+      source: "/learn/tutorials",
+    },
+    // redirect to /grant/superchain to /superchain
+    {
+      destination: "/superchain",
+      permanent: false,
+      source: "/grant/superchain",
+    },
+    // connect -> build redirects
+    {
+      destination: "/wallets",
+      permanent: false,
+      source: "/connect",
+    },
+    {
+      destination: "/account-abstraction",
+      permanent: false,
+      source: "/connect/account-abstraction",
+    },
+    {
+      destination: "/payments",
+      permanent: false,
+      source: "/connect/universal-bridge",
+    },
+    {
+      destination: "/auth",
+      permanent: false,
+      source: "/connect/auth",
+    },
+    {
+      destination: "/in-app-wallets",
+      permanent: false,
+      source: "/connect/in-app-wallets",
+    },
+    {
+      destination: "/transactions",
+      permanent: false,
+      source: "/engine",
+    },
+    {
+      destination: "/rpc",
+      permanent: false,
+      source: "/rpc-edge",
+    },
+    {
+      destination: "/payments",
+      permanent: false,
+      source: "/universal-bridge",
     },
-
     ...legacyDashboardToTeamRedirects,
+    ...projectPageRedirects,
+    ...teamPageRedirects,
+    {
+      source: "/support/:path*",
+      destination: "/team/~/~/support",
+      permanent: false,
+    },
   ];
 }
 

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

@@ -1,7 +1,7 @@
 "use server";
 
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 
 export async function acceptInvite(options: {
   teamId: string;
@@ -11,20 +11,20 @@ export async function acceptInvite(options: {
 
   if (!token) {
     return {
-      ok: false,
       errorMessage: "You are not authorized to perform this action",
+      ok: false,
     };
   }
 
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamId}/invites/${options.inviteId}/accept`,
     {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${token}`,
-      },
       body: JSON.stringify({}),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      },
+      method: "POST",
     },
   );
 
@@ -42,8 +42,8 @@ export async function acceptInvite(options: {
     } catch {}
 
     return {
-      ok: false,
       errorMessage,
+      ok: false,
     };
   }
 

apps/dashboard/src/@/actions/auth-actions.ts

@@ -1,10 +1,6 @@
 "use server";
 import "server-only";
 
-import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
-import { API_SERVER_SECRET } from "@/constants/server-envs";
-import { isVercel } from "lib/vercel-utils";
 import { cookies } from "next/headers";
 import { getAddress } from "thirdweb";
 import type {
@@ -12,7 +8,11 @@ import type {
   LoginPayload,
   VerifyLoginPayloadParams,
 } from "thirdweb/auth";
-import { verifyTurnstileToken } from "./verifyTurnstileToken";
+import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { API_SERVER_SECRET } from "@/constants/server-envs";
+import { isVercel } from "@/utils/vercel";
+import { verifyTurnstileToken } from "../../app/login/verifyTurnstileToken";
 
 export async function getLoginPayload(
   params: GenerateLoginPayloadParams,
@@ -21,15 +21,15 @@ export async function getLoginPayload(
     throw new Error("API_SERVER_SECRET is not set");
   }
   const res = await fetch(`${NEXT_PUBLIC_THIRDWEB_API_HOST}/v2/siwe/payload`, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      "x-service-api-key": API_SERVER_SECRET,
-    },
     body: JSON.stringify({
       address: params.address,
       chainId: params.chainId?.toString(),
     }),
+    headers: {
+      "Content-Type": "application/json",
+      "x-service-api-key": API_SERVER_SECRET,
+    },
+    method: "POST",
   });
 
   if (!res.ok) {
@@ -58,8 +58,8 @@ export async function doLogin(
     const result = await verifyTurnstileToken(turnstileToken);
     if (!result.success) {
       return {
-        error: "Invalid captcha. Please try again.",
         context: result.context,
+        error: "Invalid captcha. Please try again.",
       };
     }
   }
@@ -80,13 +80,13 @@ export async function doLogin(
 
   // forward the request to the API server
   const res = await fetch(`${NEXT_PUBLIC_THIRDWEB_API_HOST}/v2/siwe/login`, {
-    method: "POST",
+    // set the createAccount flag to true to create a new account if it does not exist
+    body: JSON.stringify({ ...payload, createAccount: true, utm: utmCookies }),
     headers: {
       "Content-Type": "application/json",
       "x-service-api-key": API_SERVER_SECRET,
     },
-    // set the createAccount flag to true to create a new account if it does not exist
-    body: JSON.stringify({ ...payload, createAccount: true, utm: utmCookies }),
+    method: "POST",
   });
 
   // if the request failed, log the error and throw an error
@@ -142,20 +142,20 @@ export async function doLogin(
     jwt,
     {
       httpOnly: true,
-      secure: true,
-      sameSite: "strict",
       // 3 days
       maxAge: 3 * 24 * 60 * 60,
+      sameSite: "strict",
+      secure: true,
     },
   );
 
   // set the active account cookie
   cookieStore.set(COOKIE_ACTIVE_ACCOUNT, getAddress(payload.payload.address), {
     httpOnly: true,
-    secure: true,
-    sameSite: "strict",
     // 3 days
     maxAge: 3 * 24 * 60 * 60,
+    sameSite: "strict",
+    secure: true,
   });
 
   return {
@@ -186,11 +186,11 @@ export async function isLoggedIn(address: string) {
   }
 
   const res = await fetch(`${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/account/me`, {
-    method: "GET",
     headers: {
-      "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
     },
+    method: "GET",
   });
 
   if (!res.ok) {
@@ -216,10 +216,10 @@ export async function isLoggedIn(address: string) {
   // set the active account cookie again
   cookieStore.set(COOKIE_ACTIVE_ACCOUNT, getAddress(address), {
     httpOnly: false,
-    secure: true,
-    sameSite: "strict",
     // 3 days
     maxAge: 3 * 24 * 60 * 60,
+    sameSite: "strict",
+    secure: true,
   });
   return true;
 }

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

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

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

@@ -1,7 +1,7 @@
 "use server";
 
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 
 export async function confirmEmailWithOTP(otp: string) {
   const token = await getAuthToken();
@@ -15,14 +15,14 @@ export async function confirmEmailWithOTP(otp: string) {
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/account/confirmEmail`,
     {
-      method: "PUT",
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${token}`,
-      },
       body: JSON.stringify({
         confirmationToken: otp,
       }),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      },
+      method: "PUT",
     },
   );
 

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

@@ -0,0 +1,72 @@
+"use server";
+import "server-only";
+
+// biome-ignore lint/style/useNodejsImportProtocol: breaks storybook if it's `node:` prefixed
+import { randomBytes } from "crypto";
+import { format } from "date-fns";
+import { getAuthToken } from "@/api/auth-token";
+import type { Team } from "@/api/team";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+
+export async function createTeam(options?: { name?: string; slug?: string }) {
+  const token = await getAuthToken();
+
+  if (!token) {
+    return {
+      errorMessage: "You are not authorized to perform this action",
+      status: "error",
+    } as const;
+  }
+
+  const res = await fetch(`${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams`, {
+    body: JSON.stringify({
+      billingEmail: null,
+      image: null,
+      name:
+        options?.name ?? `Your Projects ${format(new Date(), "MMM d yyyy")}`,
+      slug: options?.slug ?? randomBytes(20).toString("hex"),
+    }),
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+    method: "POST",
+  });
+
+  if (!res.ok) {
+    const reason = await res.text();
+    console.error("failed to create team", {
+      reason,
+      status: res.status,
+    });
+    switch (res.status) {
+      case 400: {
+        return {
+          errorMessage: "Invalid team name or slug.",
+          status: "error",
+        } as const;
+      }
+      case 401: {
+        return {
+          errorMessage: "You are not authorized to perform this action.",
+          status: "error",
+        } as const;
+      }
+      default: {
+        return {
+          errorMessage: "An unknown error occurred.",
+          status: "error",
+        } as const;
+      }
+    }
+  }
+
+  const json = (await res.json()) as {
+    result: Team;
+  };
+
+  return {
+    data: json.result,
+    status: "success",
+  } as const;
+}

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

@@ -0,0 +1,68 @@
+"use server";
+import "server-only";
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+
+export async function deleteTeam(options: { teamId: string }) {
+  const token = await getAuthToken();
+  if (!token) {
+    return {
+      errorMessage: "You are not authorized to perform this action.",
+      status: "error",
+    } as const;
+  }
+
+  const res = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamId}`,
+    {
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+      method: "DELETE",
+    },
+  );
+  // handle errors
+  if (!res.ok) {
+    const reason = await res.text();
+    console.error("failed to delete team", {
+      reason,
+      status: res.status,
+    });
+    switch (res.status) {
+      case 400: {
+        return {
+          errorMessage: "Invalid team ID.",
+          status: "error",
+        } as const;
+      }
+      case 401: {
+        return {
+          errorMessage: "You are not authorized to perform this action.",
+          status: "error",
+        } as const;
+      }
+
+      case 403: {
+        return {
+          errorMessage: "You do not have permission to delete this team.",
+          status: "error",
+        } as const;
+      }
+      case 404: {
+        return {
+          errorMessage: "Team not found.",
+          status: "error",
+        } as const;
+      }
+      default: {
+        return {
+          errorMessage: "An unknown error occurred.",
+          status: "error",
+        } as const;
+      }
+    }
+  }
+  return {
+    status: "success",
+  } as const;
+}

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

@@ -1,9 +1,9 @@
 "use server";
-import { defineDashboardChain } from "lib/defineDashboardChain";
-import { ZERO_ADDRESS, isAddress, toTokens } from "thirdweb";
+import { isAddress, toTokens, ZERO_ADDRESS } from "thirdweb";
 import { getWalletBalance } from "thirdweb/wallets";
-import { MORALIS_API_KEY } from "../constants/server-envs";
-import { serverThirdwebClient } from "../constants/thirdweb-client.server";
+import { MORALIS_API_KEY } from "@/constants/server-envs";
+import { serverThirdwebClient } from "@/constants/thirdweb-client.server";
+import { defineDashboardChain } from "@/lib/defineDashboardChain";
 
 type BalanceQueryResponse = Array<{
   balance: string;
@@ -43,12 +43,12 @@ export async function getTokenBalancesFromMoralis(params: {
     });
     return [
       {
-        token_address: ZERO_ADDRESS,
-        symbol: balance.symbol,
-        name: "Native Token",
-        decimals: balance.decimals,
         balance: balance.value.toString(),
+        decimals: balance.decimals,
         display_balance: toTokens(balance.value, balance.decimals),
+        name: "Native Token",
+        symbol: balance.symbol,
+        token_address: ZERO_ADDRESS,
       },
     ];
   };
@@ -59,10 +59,10 @@ export async function getTokenBalancesFromMoralis(params: {
     const tokenBalanceEndpoint = `https://deep-index.moralis.io/api/v2/${_address}/erc20?chain=${_chain}`;
 
     const resp = await fetch(tokenBalanceEndpoint, {
-      method: "GET",
       headers: {
         "x-api-key": MORALIS_API_KEY,
       },
+      method: "GET",
     });
 
     if (!resp.ok) {
@@ -83,7 +83,7 @@ export async function getTokenBalancesFromMoralis(params: {
   ]);
 
   return {
-    error: undefined,
     data: [...nativeBalance, ...tokenBalances],
+    error: undefined,
   };
 }

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

@@ -1,19 +1,19 @@
 "use server";
 
+import { NEXT_PUBLIC_DASHBOARD_CLIENT_ID } from "@/constants/public-envs";
+import { MORALIS_API_KEY } from "@/constants/server-envs";
 import {
   generateAlchemyUrl,
   transformAlchemyResponseToNFT,
-} from "lib/wallet/nfts/alchemy";
+} from "@/lib/wallet/nfts/alchemy";
 import {
   generateMoralisUrl,
   transformMoralisResponseToNFT,
-} from "lib/wallet/nfts/moralis";
-import type { WalletNFT } from "lib/wallet/nfts/types";
-import { getVercelEnv } from "../../lib/vercel-utils";
-import { isAlchemySupported } from "../../lib/wallet/nfts/isAlchemySupported";
-import { isMoralisSupported } from "../../lib/wallet/nfts/isMoralisSupported";
-import { NET_PUBLIC_DASHBOARD_THIRDWEB_CLIENT_ID } from "../constants/public-envs";
-import { MORALIS_API_KEY } from "../constants/server-envs";
+} from "@/lib/wallet/nfts/moralis";
+import type { WalletNFT } from "@/lib/wallet/nfts/types";
+import { getVercelEnv } from "@/utils/vercel";
+import { isAlchemySupported } from "../lib/wallet/nfts/isAlchemySupported";
+import { isMoralisSupported } from "../lib/wallet/nfts/isMoralisSupported";
 
 type WalletNFTApiReturn =
   | { result: WalletNFT[]; error?: undefined }
@@ -53,7 +53,7 @@ export async function getWalletNFTs(params: {
       const parsedResponse = await response.json();
       const result = await transformAlchemyResponseToNFT(parsedResponse, owner);
 
-      return { result, error: undefined };
+      return { error: undefined, result };
     } catch (err) {
       console.error("Error fetching NFTs", err);
       return { error: "error parsing response" };
@@ -64,10 +64,10 @@ export async function getWalletNFTs(params: {
     const url = generateMoralisUrl({ chainId, owner });
 
     const response = await fetch(url, {
-      method: "GET",
       headers: {
         "X-API-Key": MORALIS_API_KEY,
       },
+      method: "GET",
       next: {
         revalidate: 10, // cache for 10 seconds
       },
@@ -149,15 +149,15 @@ async function getWalletNFTsFromInsight(params: {
 
   const response = await fetch(url, {
     headers: {
-      "x-client-id": NET_PUBLIC_DASHBOARD_THIRDWEB_CLIENT_ID,
+      "x-client-id": NEXT_PUBLIC_DASHBOARD_CLIENT_ID,
     },
   });
 
   if (!response.ok) {
     const errorMessage = await response.text();
     return {
-      ok: false,
       error: errorMessage,
+      ok: false,
     };
   }
 
@@ -172,32 +172,32 @@ async function getWalletNFTsFromInsight(params: {
 
   const walletNFTs = nftsResponse.data.map((nft) => {
     const walletNFT: WalletNFT = {
-      id: nft.token_id,
+      chainId: nft.contract.chain_id,
       contractAddress: nft.contract.address,
+      id: nft.token_id,
       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,
+        description: nft.description,
+        external_url: nft.external_url,
+        image: isDev
+          ? nft.image_url.replace("ipfscdn.io/", "thirdwebstorage-dev.com/")
+          : nft.image_url,
+        name: nft.name,
+        uri: isDev
+          ? nft.metadata_url.replace("ipfscdn.io/", "thirdwebstorage-dev.com/")
+          : nft.metadata_url,
       },
       owner: params.owner,
-      tokenURI: nft.metadata_url,
-      type: nft.token_type === "erc721" ? "ERC721" : "ERC1155",
       supply: nft.balance,
       tokenAddress: nft.contract.address,
-      chainId: nft.contract.chain_id,
+      tokenURI: nft.metadata_url,
+      type: nft.token_type === "erc721" ? "ERC721" : "ERC1155",
     };
 
     return walletNFT;

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

@@ -1,11 +1,11 @@
 "use server";
 
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
+import { getAuthToken } from "@/api/auth-token";
 import {
   NEXT_PUBLIC_ENGINE_CLOUD_URL,
   NEXT_PUBLIC_THIRDWEB_API_HOST,
-} from "../constants/public-envs";
-import { ANALYTICS_SERVICE_URL } from "../constants/server-envs";
+} from "@/constants/public-envs";
+import { ANALYTICS_SERVICE_URL } from "@/constants/server-envs";
 
 type ProxyActionParams = {
   pathname: string;
@@ -47,35 +47,35 @@ async function proxy<T>(
   }
 
   const res = await fetch(url, {
-    method: params.method,
+    body: params.body,
     headers: {
       ...params.headers,
       ...(authToken ? { Authorization: `Bearer ${authToken}` } : {}),
     },
-    body: params.body,
+    method: params.method,
   });
 
   if (!res.ok) {
     try {
       const errorMessage = await res.text();
       return {
-        status: res.status,
-        ok: false,
         error: errorMessage || res.statusText,
+        ok: false,
+        status: res.status,
       };
     } catch {
       return {
-        status: res.status,
-        ok: false,
         error: res.statusText,
+        ok: false,
+        status: res.status,
       };
     }
   }
 
   return {
-    status: res.status,
-    ok: true,
     data: params.parseAsText ? await res.text() : await res.json(),
+    ok: true,
+    status: res.status,
   };
 }
 

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

@@ -0,0 +1,10 @@
+"use server";
+
+import { revalidatePath } from "next/cache";
+
+export async function revalidatePathAction(
+  path: string,
+  type: "page" | "layout",
+) {
+  revalidatePath(path, type);
+}

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

@@ -1,7 +1,7 @@
 "use server";
 
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 
 export async function sendTeamInvites(options: {
   teamId: string;
@@ -20,8 +20,8 @@ export async function sendTeamInvites(options: {
 
   if (!token) {
     return {
-      ok: false,
       errorMessage: "You are not authorized to perform this action",
+      ok: false,
     };
   }
 
@@ -43,15 +43,15 @@ async function sendInvite(
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${teamId}/invites`,
     {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${token}`,
-        "Content-Type": "application/json",
-      },
       body: JSON.stringify({
         inviteEmail: invite.email,
         inviteRole: invite.role,
       }),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      },
+      method: "POST",
     },
   );
 
@@ -59,8 +59,8 @@ async function sendInvite(
     const errorMessage = await res.text();
     return {
       email: invite.email,
-      ok: false,
       errorMessage,
+      ok: false,
     };
   }
 

apps/dashboard/src/@/actions/stripe-actions.ts

@@ -1,8 +1,8 @@
 import "server-only";
 
 import Stripe from "stripe";
-import type { Team } from "../api/team";
-import { STRIPE_SECRET_KEY } from "../constants/server-envs";
+import type { Team } from "@/api/team";
+import { STRIPE_SECRET_KEY } from "@/constants/server-envs";
 
 let existingStripe: Stripe | undefined;
 
@@ -59,3 +59,16 @@ export async function getTeamInvoices(
     throw new Error("Failed to fetch billing history");
   }
 }
+
+async function getStripeCustomer(customerId: string) {
+  return await getStripe().customers.retrieve(customerId);
+}
+
+export async function getStripeBalance(customerId: string) {
+  const customer = await getStripeCustomer(customerId);
+  if (customer.deleted) {
+    return 0;
+  }
+  // Stripe returns a positive balance for credits, so we need to divide by -100 to get the actual balance (as long as the balance is not 0)
+  return customer.balance === 0 ? 0 : customer.balance / -100;
+}

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

@@ -1,6 +1,6 @@
 "use server";
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 
 export async function updateAccount(values: {
   name?: string;
@@ -14,12 +14,12 @@ export async function updateAccount(values: {
   }
 
   const res = await fetch(`${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/account`, {
-    method: "PUT",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${token}`,
-    },
     body: JSON.stringify(values),
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+    },
+    method: "PUT",
   });
 
   if (!res.ok) {

apps/dashboard/src/@/analytics/README.md

@@ -0,0 +1,67 @@
+# Analytics Guidelines
+
+This folder centralises the **PostHog** tracking logic for the dashboard app.  
+Most developers will only need to add or extend _event-reporting_ functions in `report.ts`.
+
+---
+
+## 1. When to add an event
+1. Ask yourself if the data will be **actionable**. Every event should have a clear product or business question it helps answer.
+2. Check if a similar event already exists in `report.ts`. Avoid duplicates.
+
+---
+
+## 2. Naming conventions
+| Concept | Convention | Example |
+|---------|------------|---------|
+| **Event name** (string sent to PostHog) | Human-readable phrase formatted as `<subject> <verb>` | `"contract deployed"` |
+| **Reporting function** | `report<Subject><Verb>` (PascalCase) | `reportContractDeployed` |
+| **File** | All event functions live in the shared `report.ts` file (for now) | — |
+
+> Keeping names predictable makes it easy to search both code and analytics.
+
+---
+
+## 3. Boilerplate / template
+Add a new function to `report.ts` following this pattern:
+
+```ts
+/**
+ * ### Why do we need to report this event?
+ * - _Add bullet points explaining the product metrics/questions this event answers._
+ *
+ * ### Who is responsible for this event?
+ * @your-github-handle
+ */
+export function reportExampleEvent(properties: {
+  /* Add typed properties here */
+}) {
+  posthog.capture("example event", {
+    /* Pass the same properties here */
+  });
+}
+```
+
+Guidelines:
+1. **Explain the "why".** The JSDoc block is mandatory so future contributors know the purpose.  
+2. **Type everything.** The `properties` object should be fully typed—this doubles as documentation.
+3. **Client-side only.** `posthog-js` must never run on the server. Call these reporting helpers from client components, event handlers,  etc.
+
+---
+
+## 4. Editing or removing events
+1. Update both the function and the PostHog event definition (if required).  
+2. Inform the core services team before removing or renaming an event.
+
+---
+
+## 5. Identification & housekeeping (FYI)
+Most devs can ignore this section, but for completeness:
+
+- `hooks/identify-account.ts` and `hooks/identify-team.ts` wrap `posthog.identify`/`group` calls.
+- `resetAnalytics` clears identity state (used on logout).
+
+---
+
+## 6. Need help?
+Ping #eng-core-services in slack.

apps/dashboard/src/@/analytics/hooks/identify-account.ts

@@ -0,0 +1,20 @@
+"use client";
+
+import posthog from "posthog-js";
+import { useEffect } from "react";
+
+export function useIdentifyAccount(opts?: {
+  accountId: string;
+  email?: string;
+}) {
+  // eslint-disable-next-line no-restricted-syntax
+  useEffect(() => {
+    // if no accountId, don't identify
+    if (!opts?.accountId) {
+      return;
+    }
+
+    // if email is provided, add it to the identify
+    posthog.identify(opts.accountId, opts.email ? { email: opts.email } : {});
+  }, [opts?.accountId, opts?.email]);
+}

apps/dashboard/src/@/analytics/hooks/identify-team.ts

@@ -0,0 +1,17 @@
+"use client";
+
+import posthog from "posthog-js";
+import { useEffect } from "react";
+
+export function useIdentifyTeam(opts?: { teamId: string }) {
+  // eslint-disable-next-line no-restricted-syntax
+  useEffect(() => {
+    // if no teamId, don't identify
+    if (!opts?.teamId) {
+      return;
+    }
+
+    // identify the team
+    posthog.group("team", opts.teamId);
+  }, [opts?.teamId]);
+}

apps/dashboard/src/@/analytics/posthog-server.ts

@@ -0,0 +1,57 @@
+import "server-only";
+import { unstable_cache } from "next/cache";
+import { PostHog } from "posthog-node";
+
+let _posthogClient: PostHog | null = null;
+
+function getPostHogServer(): PostHog | null {
+  if (!_posthogClient && process.env.NEXT_PUBLIC_POSTHOG_KEY) {
+    _posthogClient = new PostHog(process.env.NEXT_PUBLIC_POSTHOG_KEY, {
+      host: "https://us.i.posthog.com",
+    });
+  }
+  return _posthogClient;
+}
+
+/**
+ * Check if a feature flag is enabled for a specific user
+ * @param flagKey - The feature flag key
+ * @param userEmail - The user's email address for filtering
+ */
+export const isFeatureFlagEnabled = unstable_cache(
+  async (params: {
+    flagKey: string;
+    accountId: string;
+    email: string | undefined;
+  }): Promise<boolean> => {
+    const posthogClient = getPostHogServer();
+    if (!posthogClient) {
+      console.warn("Posthog client not set");
+      return true;
+    }
+
+    const { flagKey, accountId, email } = params;
+
+    try {
+      if (posthogClient && accountId) {
+        const isEnabled = await posthogClient.isFeatureEnabled(
+          flagKey,
+          accountId,
+          {
+            personProperties: email ? { email } : undefined,
+          },
+        );
+        if (isEnabled !== undefined) {
+          return isEnabled;
+        }
+      }
+    } catch (error) {
+      console.error(`Error checking feature flag ${flagKey}:`, error);
+    }
+    return false;
+  },
+  ["is-feature-flag-enabled"],
+  {
+    revalidate: 3600, // 1 hour
+  },
+);

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

@@ -0,0 +1,415 @@
+import posthog from "posthog-js";
+
+import type { Team } from "@/api/team";
+import type { ProductSKU } from "../types/billing";
+
+// ----------------------------
+// CONTRACTS
+// ----------------------------
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of contracts deployed
+ * - To track the number of contracts deployed on each chain
+ * - To track if the contract was deployed on the token page vs on the deploy page
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportContractDeployed(properties: {
+  address: string;
+  chainId: number;
+  publisher: string | undefined;
+  contractName: string | undefined;
+  deploymentType?: "asset";
+}) {
+  posthog.capture("contract deployed", properties);
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of contracts that failed to deploy
+ * - To track the error message of the failed contract deployment (so we can fix it / add workarounds)
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportContractDeployFailed(properties: {
+  errorMessage: string;
+  chainId: number;
+  publisher: string | undefined;
+  contractName: string | undefined;
+}) {
+  posthog.capture("contract deploy failed", properties);
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of contracts published
+ * - To understand the type of contracts published
+ * - To understand who publishes contracts
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportContractPublished(properties: {
+  publisher: string;
+  contractName: string;
+  version: string;
+  deployType: string | undefined;
+}) {
+  posthog.capture("contract published", properties);
+}
+
+// ----------------------------
+// ONBOARDING (TEAM)
+// ----------------------------
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of teams that enter the onboarding flow
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportOnboardingStarted() {
+  posthog.capture("onboarding started");
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of teams that select a paid plan during onboarding
+ * - To know **which** plan was selected
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportOnboardingPlanSelected(properties: {
+  plan: Team["billingPlan"];
+}) {
+  posthog.capture("onboarding plan selected", properties);
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of teams that skip the plan-selection step during onboarding
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportOnboardingPlanSelectionSkipped() {
+  posthog.capture("onboarding plan selection skipped");
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of teams that invite members during onboarding
+ * - To track **how many** members were invited
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportOnboardingMembersInvited(properties: { count: number }) {
+  posthog.capture("onboarding members invited", {
+    count: properties.count,
+  });
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of teams that skip inviting members during onboarding
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportOnboardingMembersSkipped() {
+  posthog.capture("onboarding members skipped");
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track how many teams click the upsell (upgrade) button on the member-invite step during onboarding
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportOnboardingMembersUpsellButtonClicked() {
+  posthog.capture("onboarding members upsell clicked");
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track which plan is selected from the members-step upsell during onboarding
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportOnboardingMembersUpsellPlanSelected(properties: {
+  plan: Team["billingPlan"];
+}) {
+  posthog.capture("onboarding members upsell plan selected", properties);
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the number of teams that completed onboarding
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportOnboardingCompleted() {
+  posthog.capture("onboarding completed");
+}
+
+// ----------------------------
+// FAUCET
+// ----------------------------
+/**
+ * ### Why do we need to report this event?
+ * - To track which chain the faucet was used on
+ * - To track how popular specific faucets are
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportFaucetUsed(properties: { chainId: number }) {
+  posthog.capture("faucet used", {
+    chainId: properties.chainId,
+  });
+}
+
+// ----------------------------
+// CHAIN CONFIGURATION
+// ----------------------------
+/**
+ * ### Why do we need to report this event?
+ * - To track which custom chains customers are adding that we may want to add to the app
+ *
+ * ### Who is responsible for this event?
+ * @jnsdls
+ *
+ */
+export function reportChainConfigurationAdded(properties: {
+  chainId: number;
+  chainName: string;
+  rpcURLs: readonly string[];
+  nativeCurrency: {
+    name: string;
+    symbol: string;
+    decimals: number;
+  };
+}) {
+  posthog.capture("chain configuration added", {
+    chainId: properties.chainId,
+    chainName: properties.chainName,
+    nativeCurrency: properties.nativeCurrency,
+    rpcURLs: properties.rpcURLs,
+  });
+}
+
+// ----------------------------
+// ASSETS
+// ----------------------------
+
+type AssetContractType = "DropERC20" | "DropERC1155" | "DropERC721";
+
+/**
+ * ### Why do we need to report this event?
+ * - To track number of successful asset purchases from the token page
+ * - To track which asset and contract types are being purchased the most
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportAssetBuySuccessful(properties: {
+  chainId: number;
+  contractType: AssetContractType;
+  assetType: "nft" | "coin";
+}) {
+  posthog.capture("asset buy successful", {
+    assetType: properties.assetType,
+    chainId: properties.chainId,
+    contractType: properties.contractType,
+  });
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track number of failed asset purchases from the token page
+ * - To track the errors that users encounter when trying to purchase an asset
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportAssetBuyFailed(properties: {
+  chainId: number;
+  contractType: AssetContractType;
+  assetType: "nft" | "coin";
+  error: string;
+}) {
+  posthog.capture("asset buy failed", {
+    assetType: properties.assetType,
+    chainId: properties.chainId,
+    contractType: properties.contractType,
+    error: properties.error,
+  });
+}
+
+// Assets Landing Page ----------------------------
+
+/**
+ * ### Why do we need to report this event?
+ * - To track number of asset creation started from the assets page
+ * - To track which asset types are being created the most
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportAssetCreationStarted(properties: {
+  assetType: "nft" | "coin";
+}) {
+  posthog.capture("asset creation started", {
+    assetType: properties.assetType,
+  });
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track number of assets imported successfully from the assets page
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportAssetImportSuccessful() {
+  posthog.capture("asset import successful");
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track number of asset import started in the assets page
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportAssetImportStarted() {
+  posthog.capture("asset import started");
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track the steps users are configuring in the asset creation to understand if there are any drop-offs
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportAssetCreationStepConfigured(
+  properties:
+    | {
+        assetType: "nft";
+        step: "collection-info" | "upload-assets" | "sales-settings";
+      }
+    | {
+        assetType: "coin";
+        step: "coin-info" | "token-distribution" | "launch-coin";
+      },
+) {
+  posthog.capture("asset creation step configured", {
+    assetType: properties.assetType,
+    step: properties.step,
+  });
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track number of successful asset creations
+ * - To track which asset types are being created the most
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportAssetCreationSuccessful(properties: {
+  assetType: "nft" | "coin";
+  contractType: AssetContractType;
+}) {
+  posthog.capture("asset creation successful", {
+    assetType: properties.assetType,
+    contractType: properties.contractType,
+  });
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track number of failed asset creations
+ * - To track the errors that users encounter when trying to create an asset
+ * - To track the step that is failing in the asset creation
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportAssetCreationFailed(
+  properties: { contractType: AssetContractType; error: string } & (
+    | {
+        assetType: "nft";
+        step:
+          | "deploy-contract"
+          | "mint-nfts"
+          | "set-claim-conditions"
+          | "set-admins";
+      }
+    | {
+        assetType: "coin";
+        step:
+          | "deploy-contract"
+          | "set-claim-conditions"
+          | "mint-tokens"
+          | "airdrop-tokens";
+      }
+  ),
+) {
+  posthog.capture("asset creation failed", {
+    assetType: properties.assetType,
+    contractType: properties.contractType,
+    error: properties.error,
+    step: properties.step,
+  });
+}
+
+type UpsellParams = {
+  content: "storage-limit";
+  campaign: "create-coin" | "create-nft";
+  sku: Exclude<ProductSKU, null>;
+};
+
+/**
+ * ### Why do we need to report this event?
+ * - To track how effective the upsells are in driving users to upgrade
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportUpsellShown(properties: UpsellParams) {
+  posthog.capture("upsell shown", properties);
+}
+
+/**
+ * ### Why do we need to report this event?
+ * - To track how effective the upsells are in driving users to upgrade
+ *
+ * ### Who is responsible for this event?
+ * @MananTank
+ */
+export function reportUpsellClicked(properties: UpsellParams) {
+  posthog.capture("upsell clicked", properties);
+}

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

@@ -0,0 +1,7 @@
+"use client";
+
+import posthog from "posthog-js";
+
+export function resetAnalytics() {
+  posthog.reset();
+}

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

@@ -1,27 +1,64 @@
 import "server-only";
 
+import { ANALYTICS_SERVICE_URL } from "@/constants/server-envs";
 import type {
   AnalyticsQueryParams,
   EcosystemWalletStats,
+  EngineCloudStats,
   InAppWalletStats,
-  RpcMethodStats,
   TransactionStats,
   UniversalBridgeStats,
   UniversalBridgeWalletStats,
   UserOpStats,
   WalletStats,
   WalletUserStats,
-} from "types/analytics";
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { ANALYTICS_SERVICE_URL } from "../constants/server-envs";
+  WebhookLatencyStats,
+  WebhookRequestStats,
+  WebhookSummaryStats,
+} from "@/types/analytics";
+import { getAuthToken } from "./auth-token";
 import { getChains } from "./chain";
 
+export interface InsightChainStats {
+  date: string;
+  chainId: string;
+  totalRequests: number;
+}
+
+export interface InsightStatusCodeStats {
+  date: string;
+  httpStatusCode: number;
+  totalRequests: number;
+}
+
+export interface InsightEndpointStats {
+  date: string;
+  endpoint: string;
+  totalRequests: number;
+}
+
+interface InsightUsageStats {
+  date: string;
+  totalRequests: number;
+}
+
+export interface RpcMethodStats {
+  date: string;
+  evmMethod: string;
+  count: number;
+}
+
+export interface RpcUsageTypeStats {
+  date: string;
+  usageType: string;
+  count: number;
+}
+
 async function fetchAnalytics(
   input: string | URL,
   init?: RequestInit,
 ): Promise<Response> {
   const token = await getAuthToken();
-
   if (!token) {
     throw new Error("You are not authorized to perform this action");
   }
@@ -47,22 +84,11 @@ async function fetchAnalytics(
       decodeURIComponent(value),
     );
   }
-  // client id DEBUG OVERRIDE
-  // analyticsServiceUrl.searchParams.delete("projectId");
-  // analyticsServiceUrl.searchParams.delete("teamId");
-  // analyticsServiceUrl.searchParams.append(
-  //   "teamId",
-  //   "team_cm0lde33r02344w129k5hm2xz",
-  // );
-  // analyticsServiceUrl.searchParams.append(
-  //   "projectId",
-  //   "prj_cm4rqwx9b002qrnsnr37wqpo6",
-  // );
 
   return fetch(analyticsServiceUrl, {
     ...init,
     headers: {
-      "content-type": "application/json",
+      Authorization: `Bearer ${token}`,
       ...init?.headers,
     },
   });
@@ -87,6 +113,9 @@ function buildSearchParams(params: AnalyticsQueryParams): URLSearchParams {
   if (params.period) {
     searchParams.append("period", params.period);
   }
+  if (params.limit) {
+    searchParams.append("limit", params.limit.toString());
+  }
   return searchParams;
 }
 
@@ -98,7 +127,6 @@ export async function getWalletConnections(
     `v2/sdk/wallet-connects?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: { "Content-Type": "application/json" },
     },
   );
 
@@ -122,7 +150,6 @@ export async function getInAppWalletUsage(
     `v2/wallet/connects?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: { "Content-Type": "application/json" },
     },
   );
 
@@ -146,7 +173,6 @@ export async function getUserOpUsage(
     `v2/bundler/usage?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: { "Content-Type": "application/json" },
     },
   );
 
@@ -189,9 +215,9 @@ export async function getAggregateUserOpUsage(
     },
     {
       date: (params.from || new Date()).toISOString(),
-      successful: 0,
       failed: 0,
       sponsoredUsd: 0,
+      successful: 0,
     },
   );
 }
@@ -204,7 +230,6 @@ export async function getClientTransactions(
     `v2/sdk/contract-transactions?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: { "Content-Type": "application/json" },
     },
   );
 
@@ -228,7 +253,6 @@ export async function getRpcMethodUsage(
     `v2/rpc/evm-methods?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: { "Content-Type": "application/json" },
     },
   );
 
@@ -241,6 +265,26 @@ export async function getRpcMethodUsage(
   return json.data as RpcMethodStats[];
 }
 
+export async function getRpcUsageByType(
+  params: AnalyticsQueryParams,
+): Promise<RpcUsageTypeStats[]> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/rpc/usage-types?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    console.error("Failed to fetch RPC usage");
+    return [];
+  }
+
+  const json = await res.json();
+  return json.data as RpcUsageTypeStats[];
+}
+
 export async function getWalletUsers(
   params: AnalyticsQueryParams,
 ): Promise<WalletUserStats[]> {
@@ -249,7 +293,6 @@ export async function getWalletUsers(
     `v2/sdk/wallet-connects/users?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: { "Content-Type": "application/json" },
     },
   );
 
@@ -286,7 +329,6 @@ export async function isProjectActive(params: {
     `v2/active-usage?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: { "Content-Type": "application/json" },
     },
   );
 
@@ -297,14 +339,14 @@ export async function isProjectActive(params: {
     );
     return {
       bundler: false,
-      storage: false,
-      rpc: false,
-      nebula: false,
-      sdk: false,
-      insight: false,
-      pay: false,
-      inAppWallet: false,
       ecosystemWallet: false,
+      inAppWallet: false,
+      insight: false,
+      nebula: false,
+      pay: false,
+      rpc: false,
+      sdk: false,
+      storage: false,
     } as ActiveStatus;
   }
 
@@ -356,9 +398,6 @@ export async function getEcosystemWalletUsage(args: {
     `v2/wallet/connects?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-      },
     },
   );
 
@@ -385,9 +424,6 @@ export async function getUniversalBridgeUsage(args: {
   const searchParams = buildSearchParams(args);
   const res = await fetchAnalytics(`v2/universal?${searchParams.toString()}`, {
     method: "GET",
-    headers: {
-      "Content-Type": "application/json",
-    },
   });
 
   if (res?.status !== 200) {
@@ -414,9 +450,6 @@ export async function getUniversalBridgeWalletUsage(args: {
     `v2/universal/wallets?${searchParams.toString()}`,
     {
       method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-      },
     },
   );
 
@@ -425,9 +458,171 @@ export async function getUniversalBridgeWalletUsage(args: {
     console.error(
       `Failed to fetch universal bridge wallet stats: ${res?.status} - ${res.statusText} - ${reason}`,
     );
-    return null;
+    return [];
   }
 
   const json = await res.json();
   return json.data as UniversalBridgeWalletStats[];
 }
+
+export async function getEngineCloudMethodUsage(
+  params: AnalyticsQueryParams,
+): Promise<EngineCloudStats[]> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/engine-cloud/requests?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    console.error("Failed to fetch Engine Cloud method usage");
+    return [];
+  }
+
+  const json = await res.json();
+  return json.data as EngineCloudStats[];
+}
+
+export async function getWebhookSummary(
+  params: AnalyticsQueryParams & { webhookId: string },
+): Promise<{ data: WebhookSummaryStats[] } | { error: string }> {
+  const searchParams = buildSearchParams(params);
+  searchParams.append("webhookId", params.webhookId);
+
+  const res = await fetchAnalytics(
+    `v2/webhook/summary?${searchParams.toString()}`,
+  );
+  if (!res.ok) {
+    const reason = await res.text();
+    return { error: reason };
+  }
+
+  return (await res.json()) as { data: WebhookSummaryStats[] };
+}
+
+export async function getWebhookRequests(
+  params: AnalyticsQueryParams & { webhookId?: string },
+): Promise<{ data: WebhookRequestStats[] } | { error: string }> {
+  const searchParams = buildSearchParams(params);
+  if (params.webhookId) {
+    searchParams.append("webhookId", params.webhookId);
+  }
+
+  const res = await fetchAnalytics(
+    `v2/webhook/requests?${searchParams.toString()}`,
+  );
+  if (!res.ok) {
+    const reason = await res.text();
+    return { error: reason };
+  }
+
+  return (await res.json()) as { data: WebhookRequestStats[] };
+}
+
+export async function getWebhookLatency(
+  params: AnalyticsQueryParams & { webhookId?: string },
+): Promise<{ data: WebhookLatencyStats[] } | { error: string }> {
+  const searchParams = buildSearchParams(params);
+  if (params.webhookId) {
+    searchParams.append("webhookId", params.webhookId);
+  }
+  const res = await fetchAnalytics(
+    `v2/webhook/latency?${searchParams.toString()}`,
+  );
+  if (!res.ok) {
+    const reason = await res.text();
+    return { error: reason };
+  }
+
+  return (await res.json()) as { data: WebhookLatencyStats[] };
+}
+
+export async function getInsightChainUsage(
+  params: AnalyticsQueryParams,
+): Promise<{ data: InsightChainStats[] } | { errorMessage: string }> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/insight/usage/by-chain?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    const reason = await res?.text();
+    const errMsg = `Failed to fetch Insight chain usage: ${res?.status} - ${res.statusText} - ${reason}`;
+    console.error(errMsg);
+    return { errorMessage: errMsg };
+  }
+
+  const json = await res.json();
+  return { data: json.data as InsightChainStats[] };
+}
+
+export async function getInsightStatusCodeUsage(
+  params: AnalyticsQueryParams,
+): Promise<{ data: InsightStatusCodeStats[] } | { errorMessage: string }> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/insight/usage/by-status-code?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    const reason = await res?.text();
+    const errMsg = `Failed to fetch Insight status code usage: ${res?.status} - ${res.statusText} - ${reason}`;
+    console.error(errMsg);
+    return { errorMessage: errMsg };
+  }
+
+  const json = await res.json();
+  return { data: json.data as InsightStatusCodeStats[] };
+}
+
+export async function getInsightEndpointUsage(
+  params: AnalyticsQueryParams,
+): Promise<{ data: InsightEndpointStats[] } | { errorMessage: string }> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/insight/usage/by-endpoint?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    const reason = await res?.text();
+    const errMsg = `Failed to fetch Insight endpoint usage: ${res?.status} - ${res.statusText} - ${reason}`;
+    console.error(errMsg);
+    return { errorMessage: errMsg };
+  }
+
+  const json = await res.json();
+  return { data: json.data as InsightEndpointStats[] };
+}
+
+export async function getInsightUsage(
+  params: AnalyticsQueryParams,
+): Promise<{ data: InsightUsageStats[] } | { errorMessage: string }> {
+  const searchParams = buildSearchParams(params);
+  const res = await fetchAnalytics(
+    `v2/insight/usage?${searchParams.toString()}`,
+    {
+      method: "GET",
+    },
+  );
+
+  if (res?.status !== 200) {
+    const reason = await res?.text();
+    const errMsg = `Failed to fetch Insight usage: ${res?.status} - ${res.statusText} - ${reason}`;
+    console.error(errMsg);
+    return { errorMessage: errMsg };
+  }
+
+  const json = await res.json();
+  return { data: json.data as InsightUsageStats[] };
+}

apps/dashboard/src/@/api/audit-log.ts

@@ -0,0 +1,91 @@
+"use server";
+
+import "server-only";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { getAuthToken } from "./auth-token";
+
+export type AuditLogEntry = {
+  who: {
+    text: string;
+    metadata?: {
+      email?: string;
+      image?: string;
+      wallet?: string;
+      clientId?: string;
+    };
+    type: "user" | "apikey" | "system";
+    path?: string;
+  };
+  what: {
+    text: string;
+    action: "create" | "update" | "delete";
+    path?: string;
+    in?: {
+      text: string;
+      path?: string;
+    };
+    description?: string;
+    resourceType:
+      | "team"
+      | "project"
+      | "team-member"
+      | "team-invite"
+      | "contract"
+      | "secret-key";
+  };
+  when: string;
+};
+
+type AuditLogApiResponse = {
+  result: AuditLogEntry[];
+  nextCursor?: string;
+  hasMore: boolean;
+};
+
+export async function getAuditLogs(teamSlug: string, cursor?: string) {
+  const authToken = await getAuthToken();
+  if (!authToken) {
+    throw new Error("No auth token found");
+  }
+  const url = new URL(
+    `/v1/teams/${teamSlug}/audit-log`,
+    NEXT_PUBLIC_THIRDWEB_API_HOST,
+  );
+  if (cursor) {
+    url.searchParams.set("cursor", cursor);
+  }
+  // artifically limit page size to 15 for now
+  url.searchParams.set("take", "15");
+
+  const response = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+    },
+    next: {
+      // revalidate this query once per 10 seconds (does not need to be more granular than that)
+      revalidate: 10,
+    },
+  });
+  if (!response.ok) {
+    // if the status is 402, the most likely reason is that the team is on a free plan
+    if (response.status === 402) {
+      return {
+        reason: "higher_plan_required",
+        status: "error",
+      } as const;
+    }
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    } as const;
+  }
+
+  const data = (await response.json()) as AuditLogApiResponse;
+
+  return {
+    data,
+    status: "success",
+  } as const;
+}

apps/dashboard/src/@/api/auth-token.ts

@@ -1,7 +1,7 @@
-import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
-import { LAST_USED_TEAM_ID } from "constants/cookies";
 import { cookies } from "next/headers";
-import { getClientThirdwebClient } from "../../../../@/constants/thirdweb-client.client";
+import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
+import { LAST_USED_TEAM_ID } from "@/constants/cookies";
+import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
 
 export async function getAuthToken() {
   const cookiesManager = await cookies();
@@ -29,8 +29,18 @@ export async function getAuthTokenWalletAddress() {
   return null;
 }
 
-export async function getUserThirdwebClient() {
+export async function getUserThirdwebClient(params: {
+  teamId: string | undefined;
+}) {
   const authToken = await getAuthToken();
+
+  if (params.teamId) {
+    return getClientThirdwebClient({
+      jwt: authToken,
+      teamId: params.teamId,
+    });
+  }
+
   const cookiesManager = await cookies();
   const lastUsedTeamId = cookiesManager.get(LAST_USED_TEAM_ID)?.value;
 

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

@@ -1,43 +1,7 @@
 import "server-only";
 import type { ChainMetadata } from "thirdweb/chains";
-import type { ChainService } from "../../app/(app)/(dashboard)/(chain)/types/chain";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
-import { API_SERVER_SECRET } from "../constants/server-envs";
-
-export async function getGasSponsoredChains() {
-  if (!API_SERVER_SECRET) {
-    throw new Error("API_SERVER_SECRET is not set");
-  }
-  const res = await fetch(
-    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/chains/gas-sponsored`,
-    {
-      headers: {
-        "Content-Type": "application/json",
-        "x-service-api-key": API_SERVER_SECRET,
-      },
-      next: {
-        revalidate: 15 * 60, //15 minutes
-      },
-    },
-  );
-
-  if (!res.ok) {
-    console.error(
-      "Failed to fetch gas sponsored chains",
-      res.status,
-      res.statusText,
-    );
-    res.body?.cancel();
-    return [];
-  }
-
-  try {
-    return (await res.json()).data as number[];
-  } catch (e) {
-    console.error("Failed to parse gas sponsored chains", e);
-    return [];
-  }
-}
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import type { ChainService } from "@/types/chain";
 
 export function getChains() {
   return fetch(

apps/dashboard/src/@/api/dedicated-support.ts

@@ -0,0 +1,40 @@
+"use server";
+import "server-only";
+
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { getAuthToken } from "./auth-token";
+
+export async function createDedicatedSupportChannel(
+  teamIdOrSlug: string,
+  channelType: "slack" | "telegram",
+): Promise<{ error: string | null }> {
+  const token = await getAuthToken();
+  if (!token) {
+    return { error: "Unauthorized" };
+  }
+
+  const res = await fetch(
+    new URL(
+      `/v1/teams/${teamIdOrSlug}/dedicated-support-channel`,
+      NEXT_PUBLIC_THIRDWEB_API_HOST,
+    ),
+    {
+      body: JSON.stringify({
+        type: channelType,
+      }),
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+    },
+  );
+  if (!res.ok) {
+    const json = await res.json();
+    return {
+      error:
+        json.error?.message ?? "Failed to create dedicated support channel.",
+    };
+  }
+  return { error: null };
+}

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

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

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

@@ -0,0 +1,86 @@
+import "server-only";
+import { getAddress } from "thirdweb";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+
+export type ProjectContract = {
+  id: string;
+  contractAddress: string;
+  chainId: string;
+  createdAt: string;
+  updatedAt: string;
+  deploymentType: string | null;
+  contractType: string | null;
+};
+
+export async function getProjectContracts(options: {
+  teamId: string;
+  projectId: string;
+  authToken: string;
+  deploymentType: string | undefined;
+}) {
+  const url = new URL(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamId}/projects/${options.projectId}/contracts`,
+  );
+  if (options.deploymentType) {
+    url.searchParams.set("deploymentType", options.deploymentType);
+  }
+
+  const res = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${options.authToken}`,
+    },
+  });
+
+  if (!res.ok) {
+    const errorMessage = await res.text();
+    console.error("Error fetching project contracts");
+    console.error(errorMessage);
+    return [];
+  }
+
+  const data = (await res.json()) as {
+    result: ProjectContract[];
+  };
+
+  return data.result;
+}
+
+export type PartialProject = {
+  id: string;
+  name: string;
+  slug: string;
+  image: string | null;
+};
+
+/**
+ * get a list of projects within a team that have a given contract imported
+ */
+export async function getContractImportedProjects(options: {
+  teamId: string;
+  authToken: string;
+  chainId: number;
+  contractAddress: string;
+}) {
+  const url = new URL(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${options.teamId}/projects/contracts/lookup?chainId=${options.chainId}&contractAddress=${getAddress(options.contractAddress)}`,
+  );
+
+  const res = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${options.authToken}`,
+    },
+  });
+
+  if (!res.ok) {
+    const errorMessage = await res.text();
+    console.error("Error fetching: /projects/contracts/lookup");
+    console.error(errorMessage);
+    return [];
+  }
+
+  const data = (await res.json()) as {
+    result: PartialProject[];
+  };
+
+  return data.result;
+}

apps/dashboard/src/@/api/insight/webhooks.ts

@@ -0,0 +1,239 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+"use server";
+
+import { getAuthToken } from "@/api/auth-token";
+import { THIRDWEB_INSIGHT_API_DOMAIN } from "@/constants/urls";
+
+export interface WebhookResponse {
+  id: string;
+  name: string;
+  team_id: string;
+  project_id: string;
+  webhook_url: string;
+  webhook_secret: string;
+  filters: WebhookFilters;
+  suspended_at: string | null;
+  suspended_reason: string | null;
+  disabled: boolean;
+  created_at: string;
+  updated_at: string | null;
+}
+
+export interface WebhookFilters {
+  "v1.events"?: {
+    chain_ids?: string[];
+    addresses?: string[];
+    signatures?: Array<{
+      sig_hash: string;
+      abi?: string;
+      params?: Record<string, unknown>;
+    }>;
+  };
+  "v1.transactions"?: {
+    chain_ids?: string[];
+    from_addresses?: string[];
+    to_addresses?: string[];
+    signatures?: Array<{
+      sig_hash: string;
+      abi?: string;
+      params?: Record<string, unknown>;
+    }>;
+  };
+}
+
+interface CreateWebhookPayload {
+  name: string;
+  webhook_url: string;
+  filters: WebhookFilters;
+}
+
+interface WebhooksListResponse {
+  data: WebhookResponse[];
+  error?: string;
+}
+
+interface WebhookSingleResponse {
+  data: WebhookResponse | null;
+  error?: string;
+}
+
+interface TestWebhookPayload {
+  webhook_url: string;
+  type?: "event" | "transaction";
+}
+
+interface TestWebhookResponse {
+  success: boolean;
+  error?: string;
+}
+
+type SupportedWebhookChainsResponse =
+  | { chains: Array<number> }
+  | { error: string };
+
+export async function createWebhook(
+  payload: CreateWebhookPayload,
+  clientId: string,
+): Promise<WebhookSingleResponse> {
+  try {
+    const authToken = await getAuthToken();
+    const response = await fetch(
+      `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks`,
+      {
+        body: JSON.stringify(payload),
+        headers: {
+          Authorization: `Bearer ${authToken}`,
+          "Content-Type": "application/json",
+          "x-client-id": clientId,
+        },
+        method: "POST",
+      },
+    );
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      return {
+        data: null,
+        error: `Failed to create webhook: ${errorText}`,
+      };
+    }
+
+    return (await response.json()) as WebhookSingleResponse;
+  } catch (error) {
+    return {
+      data: null,
+      error: `Network or parsing error: ${error instanceof Error ? error.message : "Unknown error"}`,
+    };
+  }
+}
+
+export async function getWebhooks(
+  clientId: string,
+): Promise<WebhooksListResponse> {
+  try {
+    const authToken = await getAuthToken();
+    const response = await fetch(
+      `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks`,
+      {
+        headers: {
+          Authorization: `Bearer ${authToken}`,
+          "x-client-id": clientId,
+        },
+        method: "GET",
+      },
+    );
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      return {
+        data: [],
+        error: `Failed to get webhooks: ${errorText}`,
+      };
+    }
+
+    return (await response.json()) as WebhooksListResponse;
+  } catch (error) {
+    return {
+      data: [],
+      error: `Network or parsing error: ${error instanceof Error ? error.message : "Unknown error"}`,
+    };
+  }
+}
+
+export async function deleteWebhook(
+  webhookId: string,
+  clientId: string,
+): Promise<WebhookSingleResponse> {
+  try {
+    const authToken = await getAuthToken();
+    const response = await fetch(
+      `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks/${encodeURIComponent(webhookId)}`,
+      {
+        headers: {
+          Authorization: `Bearer ${authToken}`,
+          "x-client-id": clientId,
+        },
+        method: "DELETE",
+      },
+    );
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      return {
+        data: null,
+        error: `Failed to delete webhook: ${errorText}`,
+      };
+    }
+
+    return (await response.json()) as WebhookSingleResponse;
+  } catch (error) {
+    return {
+      data: null,
+      error: `Network or parsing error: ${error instanceof Error ? error.message : "Unknown error"}`,
+    };
+  }
+}
+
+export async function testWebhook(
+  payload: TestWebhookPayload,
+  clientId: string,
+): Promise<TestWebhookResponse> {
+  try {
+    const authToken = await getAuthToken();
+    const response = await fetch(
+      `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks/test`,
+      {
+        body: JSON.stringify(payload),
+        headers: {
+          Authorization: `Bearer ${authToken}`,
+          "Content-Type": "application/json",
+          "x-client-id": clientId,
+        },
+        method: "POST",
+      },
+    );
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      return {
+        error: `Failed to test webhook: ${errorText}`,
+        success: false,
+      };
+    }
+
+    return (await response.json()) as TestWebhookResponse;
+  } catch (error) {
+    return {
+      error: `Network or parsing error: ${error instanceof Error ? error.message : "Unknown error"}`,
+      success: false,
+    };
+  }
+}
+
+export async function getSupportedWebhookChains(): Promise<SupportedWebhookChainsResponse> {
+  try {
+    const response = await fetch(
+      `https://${THIRDWEB_INSIGHT_API_DOMAIN}/service/chains`,
+      {
+        headers: {
+          "x-service-api-key": process.env.INSIGHT_SERVICE_API_KEY || "",
+        },
+        method: "GET",
+      },
+    );
+
+    if (!response.ok) {
+      const errorText = await response.json();
+      return { error: `Failed to fetch supported chains: ${errorText.error}` };
+    }
+
+    const data = await response.json();
+    if (Array.isArray(data.data)) {
+      return { chains: data.data };
+    }
+    return { error: "Unexpected response format" };
+  } catch (error) {
+    console.error("Error fetching supported chains:", error);
+    return { error: `Failed to fetch supported chains: ${error}` };
+  }
+}

apps/dashboard/src/@/api/linked-wallets.ts

@@ -1,5 +1,5 @@
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { getAuthToken } from "./auth-token";
 
 export type LinkedWallet = {
   createdAt: string;

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

@@ -0,0 +1,157 @@
+"use server";
+
+import "server-only";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { getAuthToken } from "./auth-token";
+
+export type Notification = {
+  id: string;
+  createdAt: string;
+  accountId: string;
+  teamId: string | null;
+  description: string;
+  readAt: string | null;
+  ctaText: string;
+  ctaUrl: string;
+};
+
+export type NotificationsApiResponse = {
+  result: Notification[];
+  nextCursor?: string;
+};
+
+export async function getUnreadNotifications(cursor?: string) {
+  const authToken = await getAuthToken();
+  if (!authToken) {
+    throw new Error("No auth token found");
+  }
+  const url = new URL(
+    "/v1/dashboard-notifications/unread",
+    NEXT_PUBLIC_THIRDWEB_API_HOST,
+  );
+  if (cursor) {
+    url.searchParams.set("cursor", cursor);
+  }
+
+  const response = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+    },
+  });
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    } as const;
+  }
+
+  const data = (await response.json()) as NotificationsApiResponse;
+
+  return {
+    data,
+    status: "success",
+  } as const;
+}
+
+export async function getArchivedNotifications(cursor?: string) {
+  const authToken = await getAuthToken();
+  if (!authToken) {
+    throw new Error("No auth token found");
+  }
+
+  const url = new URL(
+    "/v1/dashboard-notifications/archived",
+    NEXT_PUBLIC_THIRDWEB_API_HOST,
+  );
+  if (cursor) {
+    url.searchParams.set("cursor", cursor);
+  }
+
+  const response = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+    },
+  });
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    } as const;
+  }
+
+  const data = (await response.json()) as NotificationsApiResponse;
+
+  return {
+    data,
+    status: "success",
+  } as const;
+}
+
+export async function getUnreadNotificationsCount() {
+  const authToken = await getAuthToken();
+  if (!authToken) {
+    throw new Error("No auth token found");
+  }
+
+  const url = new URL(
+    "/v1/dashboard-notifications/unread-count",
+    NEXT_PUBLIC_THIRDWEB_API_HOST,
+  );
+  const response = await fetch(url, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+    },
+  });
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    } as const;
+  }
+  const data = (await response.json()) as {
+    result: {
+      unreadCount: number;
+    };
+  };
+  return {
+    data,
+    status: "success",
+  } as const;
+}
+
+export async function markNotificationAsRead(notificationId?: string) {
+  const authToken = await getAuthToken();
+  if (!authToken) {
+    throw new Error("No auth token found");
+  }
+  const url = new URL(
+    "/v1/dashboard-notifications/mark-as-read",
+    NEXT_PUBLIC_THIRDWEB_API_HOST,
+  );
+  const response = await fetch(url, {
+    // if notificationId is provided, mark it as read, otherwise mark all as read
+    body: JSON.stringify(notificationId ? { notificationId } : {}),
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+      "Content-Type": "application/json",
+    },
+    method: "PUT",
+  });
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    } as const;
+  }
+  return {
+    status: "success",
+  } as const;
+}

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

@@ -1,7 +1,7 @@
 import "server-only";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import type { ProjectResponse } from "@thirdweb-dev/service-utils";
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { getAuthToken } from "./auth-token";
 
 export type Project = ProjectResponse;
 

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

@@ -1,6 +1,6 @@
 import "server-only";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
-import { API_SERVER_SECRET } from "../constants/server-envs";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { API_SERVER_SECRET } from "@/constants/server-envs";
 
 export type SMSCountryTiers = {
   tier1: string[];

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

@@ -0,0 +1,143 @@
+"use server";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import type { SupportTicket } from "../../app/(app)/team/[team_slug]/(team)/~/support/types/tickets";
+import { getAuthToken, getAuthTokenWalletAddress } from "./auth-token";
+
+const ESCALATION_FEEDBACK_RATING = 9999;
+
+export async function createSupportTicket(params: {
+  message: string;
+  teamSlug: string;
+  teamId: string;
+  title: string;
+  conversationId?: string;
+}): Promise<{ data: SupportTicket } | { error: string }> {
+  const token = await getAuthToken();
+  if (!token) {
+    return { error: "No auth token available" };
+  }
+
+  try {
+    const walletAddress = await getAuthTokenWalletAddress();
+
+    const encodedTeamSlug = encodeURIComponent(params.teamSlug);
+    const apiUrl = `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${encodedTeamSlug}/support-conversations`;
+
+    // Build the payload for creating a conversation
+    // If the message does not already include wallet address, prepend it
+    let message = params.message;
+    if (!message.includes("Wallet address:")) {
+      message = `Wallet address: ${String(walletAddress || "-")}\n${message}`;
+    }
+
+    const payload = {
+      markdown: message.trim(),
+      title: params.title,
+    };
+
+    const body = JSON.stringify(payload);
+    const headers: Record<string, string> = {
+      Accept: "application/json",
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+      "Accept-Encoding": "identity",
+    };
+
+    const response = await fetch(apiUrl, {
+      body,
+      headers,
+      method: "POST",
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      return { error: `API Server error: ${response.status} - ${errorText}` };
+    }
+
+    const createdConversation: SupportTicket = await response.json();
+
+    // Escalate to SIWA feedback endpoint if conversationId is provided
+    if (params.conversationId) {
+      try {
+        const siwaUrl = process.env.NEXT_PUBLIC_SIWA_URL;
+        if (siwaUrl) {
+          await fetch(`${siwaUrl}/v1/chat/feedback`, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: `Bearer ${token}`,
+              ...(params.teamId ? { "x-team-id": params.teamId } : {}),
+            },
+            body: JSON.stringify({
+              conversationId: params.conversationId,
+              feedbackRating: ESCALATION_FEEDBACK_RATING,
+            }),
+          });
+        }
+      } catch (error) {
+        // Log error but don't fail the ticket creation
+        console.error("Failed to escalate to SIWA feedback:", error);
+      }
+    }
+
+    return { data: createdConversation };
+  } catch (error) {
+    return {
+      error: `Failed to create support ticket: ${error instanceof Error ? error.message : "Unknown error"}`,
+    };
+  }
+}
+
+export async function sendMessageToTicket(request: {
+  ticketId: string;
+  teamSlug: string;
+  teamId: string;
+  message: string;
+}): Promise<{ success: true } | { error: string }> {
+  if (!request.ticketId || !request.teamSlug) {
+    return { error: "Ticket ID and team slug are required" };
+  }
+
+  const token = await getAuthToken();
+  if (!token) {
+    return { error: "No auth token available" };
+  }
+
+  try {
+    const encodedTeamSlug = encodeURIComponent(request.teamSlug);
+    const encodedTicketId = encodeURIComponent(request.ticketId);
+    const apiUrl = `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${encodedTeamSlug}/support-conversations/${encodedTicketId}/messages`;
+
+    // Append /unthread send for customer messages to ensure proper routing
+    const messageWithUnthread = `${request.message.trim()}\n/unthread send`;
+    const payload = {
+      markdown: messageWithUnthread,
+    };
+
+    const body = JSON.stringify(payload);
+    const headers: Record<string, string> = {
+      Accept: "application/json",
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json",
+      "Accept-Encoding": "identity",
+      ...(request.teamId ? { "x-team-id": request.teamId } : {}),
+    };
+
+    const response = await fetch(apiUrl, {
+      body,
+      headers,
+      method: "POST",
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      return { error: `API Server error: ${response.status} - ${errorText}` };
+    }
+
+    return { success: true };
+  } catch (error) {
+    return {
+      error: `Failed to send message: ${error instanceof Error ? error.message : "Unknown error"}`,
+    };
+  }
+}

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

@@ -1,5 +1,5 @@
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { getAuthToken } from "./auth-token";
 
 export type TeamInvite = {
   id: string;

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

@@ -1,10 +1,10 @@
 import "server-only";
 import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
+import { getAuthToken } from "./auth-token";
 
 const TeamAccountRole = {
-  OWNER: "OWNER",
   MEMBER: "MEMBER",
+  OWNER: "OWNER",
 } as const;
 
 export type TeamAccountRole =
@@ -33,7 +33,7 @@ export async function getMembers(teamSlug: string) {
   }
 
   const teamsRes = await fetch(
-    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${teamSlug}/members`,
+    new URL(`/v1/teams/${teamSlug}/members`, NEXT_PUBLIC_THIRDWEB_API_HOST),
     {
       headers: {
         Authorization: `Bearer ${token}`,
@@ -48,7 +48,10 @@ export async function getMembers(teamSlug: string) {
   return undefined;
 }
 
-export async function getMemberById(teamSlug: string, memberId: string) {
+export async function getMemberByAccountId(
+  teamSlug: string,
+  accountId: string,
+) {
   const token = await getAuthToken();
 
   if (!token) {
@@ -56,7 +59,10 @@ export async function getMemberById(teamSlug: string, memberId: string) {
   }
 
   const res = await fetch(
-    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${teamSlug}/members/${memberId}`,
+    new URL(
+      `/v1/teams/${teamSlug}/members/${accountId}`,
+      NEXT_PUBLIC_THIRDWEB_API_HOST,
+    ),
     {
       headers: {
         Authorization: `Bearer ${token}`,

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

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

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

@@ -1,10 +1,12 @@
 import "server-only";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
-import { API_SERVER_SECRET } from "@/constants/server-envs";
 import type { TeamResponse } from "@thirdweb-dev/service-utils";
 import { cookies } from "next/headers";
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { LAST_USED_TEAM_ID } from "../../constants/cookies";
+import { LAST_USED_TEAM_ID } from "@/constants/cookies";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { API_SERVER_SECRET } from "@/constants/server-envs";
+import { getValidAccount } from "../../app/(app)/account/settings/getAccount";
+import { getAuthToken } from "./auth-token";
+import { getMemberByAccountId } from "./team-members";
 
 export type Team = TeamResponse & { stripeCustomerId: string | null };
 
@@ -46,7 +48,7 @@ export async function service_getTeamBySlug(slug: string) {
   return null;
 }
 
-export function getTeamById(id: string) {
+function getTeamById(id: string) {
   return getTeamBySlug(id);
 }
 
@@ -67,6 +69,7 @@ export async function getTeams() {
   return null;
 }
 
+/** @deprecated */
 export async function getDefaultTeam() {
   const token = await getAuthToken();
   if (!token) {
@@ -84,7 +87,7 @@ export async function getDefaultTeam() {
   return null;
 }
 
-export async function getLastVisitedTeamOrDefaultTeam() {
+export async function getLastVisitedTeam() {
   const token = await getAuthToken();
   if (!token) {
     return null;
@@ -100,5 +103,25 @@ export async function getLastVisitedTeamOrDefaultTeam() {
     }
   }
 
-  return getDefaultTeam();
+  return null;
+}
+
+export async function hasToCompleteTeamOnboarding(
+  team: Team,
+  pagePath: string,
+) {
+  // if the team is already onboarded, we don't need to check anything else here
+  if (team.isOnboarded) {
+    return false;
+  }
+  const account = await getValidAccount(pagePath);
+  const teamMember = await getMemberByAccountId(team.slug, account.id);
+
+  // if the team member is not an owner (or we cannot find them), they cannot complete onboarding anyways
+  if (teamMember?.role !== "OWNER") {
+    return false;
+  }
+
+  // if we get here the team is not onboarded and the team member is an owner, so we need to show the onboarding page
+  return true;
 }

apps/dashboard/src/@/api/universal-bridge/developer.ts

@@ -1,6 +1,6 @@
 "use server";
-import { getAuthToken } from "app/(app)/api/lib/getAuthToken";
-import { NEXT_PUBLIC_THIRDWEB_BRIDGE_HOST } from "../../constants/public-envs";
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_BRIDGE_HOST } from "@/constants/public-envs";
 
 const UB_BASE_URL = NEXT_PUBLIC_THIRDWEB_BRIDGE_HOST;
 
@@ -14,19 +14,16 @@ type Webhook = {
   version?: number; // TODO (UB) make this mandatory after migration
 };
 
-export async function getWebhooks(props: {
-  clientId: string;
-  teamId: string;
-}) {
+export async function getWebhooks(props: { clientId: string; teamId: string }) {
   const authToken = await getAuthToken();
   const res = await fetch(`${UB_BASE_URL}/v1/developer/webhooks`, {
-    method: "GET",
     headers: {
+      Authorization: `Bearer ${authToken}`,
       "Content-Type": "application/json",
       "x-client-id": props.clientId,
       "x-team-id": props.teamId,
-      Authorization: `Bearer ${authToken}`,
     },
+    method: "GET",
   });
 
   if (!res.ok) {
@@ -47,27 +44,21 @@ export async function createWebhook(props: {
   secret?: string;
 }) {
   const authToken = await getAuthToken();
-  console.log(
-    "UB_BASE_URL",
-    UB_BASE_URL,
-    props.clientId,
-    props.teamId,
-    authToken,
-  );
+
   const res = await fetch(`${UB_BASE_URL}/v1/developer/webhooks`, {
-    method: "POST",
     body: JSON.stringify({
-      url: props.url,
       label: props.label,
-      version: props.version,
       secret: props.secret,
+      url: props.url,
+      version: props.version,
     }),
     headers: {
+      Authorization: `Bearer ${authToken}`,
       "Content-Type": "application/json",
       "x-client-id": props.clientId,
       "x-team-id": props.teamId,
-      Authorization: `Bearer ${authToken}`,
     },
+    method: "POST",
   });
 
   if (!res.ok) {
@@ -87,13 +78,13 @@ export async function deleteWebhook(props: {
   const res = await fetch(
     `${UB_BASE_URL}/v1/developer/webhooks/${props.webhookId}`,
     {
-      method: "DELETE",
       headers: {
+        Authorization: `Bearer ${authToken}`,
         "Content-Type": "application/json",
         "x-client-id": props.clientId,
         "x-team-id": props.teamId,
-        Authorization: `Bearer ${authToken}`,
       },
+      method: "DELETE",
     },
   );
 
@@ -112,19 +103,16 @@ export type Fee = {
   updatedAt: string;
 };
 
-export async function getFees(props: {
-  clientId: string;
-  teamId: string;
-}) {
+export async function getFees(props: { clientId: string; teamId: string }) {
   const authToken = await getAuthToken();
   const res = await fetch(`${UB_BASE_URL}/v1/developer/fees`, {
-    method: "GET",
     headers: {
-      "Content-Type": "application/json",
-      "x-team-id": props.teamId,
-      "x-client-id": props.clientId,
       Authorization: `Bearer ${authToken}`,
+      "Content-Type": "application/json",
+      "x-client-id": props.clientId,
+      "x-team-id": props.teamId,
     },
+    method: "GET",
   });
 
   if (!res.ok) {
@@ -144,17 +132,17 @@ export async function updateFee(props: {
 }) {
   const authToken = await getAuthToken();
   const res = await fetch(`${UB_BASE_URL}/v1/developer/fees`, {
-    method: "PUT",
-    headers: {
-      "Content-Type": "application/json",
-      "x-team-id": props.teamId,
-      "x-client-id": props.clientId,
-      Authorization: `Bearer ${authToken}`,
-    },
     body: JSON.stringify({
-      feeRecipient: props.feeRecipient,
       feeBps: props.feeBps,
+      feeRecipient: props.feeRecipient,
     }),
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+      "Content-Type": "application/json",
+      "x-client-id": props.clientId,
+      "x-team-id": props.teamId,
+    },
+    method: "PUT",
   });
 
   if (!res.ok) {
@@ -231,13 +219,13 @@ export async function getPayments(props: {
   }
 
   const res = await fetch(url, {
-    method: "GET",
     headers: {
+      Authorization: `Bearer ${authToken}`,
       "Content-Type": "application/json",
       "x-client-id": props.clientId,
       "x-team-id": props.teamId,
-      Authorization: `Bearer ${authToken}`,
     },
+    method: "GET",
   });
 
   if (!res.ok) {

apps/dashboard/src/@/api/universal-bridge/links.ts

@@ -0,0 +1,45 @@
+import "server-only";
+
+import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
+import { UB_BASE_URL } from "./constants";
+
+type PaymentLink = {
+  clientId: string;
+  title?: string;
+  imageUrl?: string;
+  receiver: string;
+  destinationToken: {
+    address: string;
+    symbol: string;
+    decimals: number;
+    chainId: number;
+  };
+  amount: bigint | undefined;
+  purchaseData: Record<string, unknown> | undefined;
+};
+
+export async function getPaymentLink(props: { paymentId: string }) {
+  const res = await fetch(`${UB_BASE_URL}/v1/links/${props.paymentId}`, {
+    headers: {
+      "Content-Type": "application/json",
+      "x-secret-key": DASHBOARD_THIRDWEB_SECRET_KEY,
+    },
+    method: "GET",
+  });
+
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(text);
+  }
+
+  const { data } = await res.json();
+  return {
+    amount: data.amount ? BigInt(data.amount) : undefined,
+    clientId: data.clientId,
+    destinationToken: data.destinationToken,
+    imageUrl: data.imageUrl,
+    purchaseData: data.purchaseData,
+    receiver: data.receiver,
+    title: data.title,
+  } as PaymentLink;
+}

apps/dashboard/src/@/api/universal-bridge/tokens.ts

@@ -1,4 +1,6 @@
 "use server";
+import type { ProjectResponse } from "@thirdweb-dev/service-utils";
+import { getAuthToken } from "@/api/auth-token";
 import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
 import { UB_BASE_URL } from "./constants";
 
@@ -11,9 +13,7 @@ export type TokenMetadata = {
   iconUri?: string;
 };
 
-export async function getUniversalBridgeTokens(props: {
-  chainId?: number;
-}) {
+export async function getUniversalBridgeTokens(props: { chainId?: number }) {
   const url = new URL(`${UB_BASE_URL}/v1/tokens`);
 
   if (props.chainId) {
@@ -22,11 +22,41 @@ export async function getUniversalBridgeTokens(props: {
   url.searchParams.append("limit", "1000");
 
   const res = await fetch(url.toString(), {
-    method: "GET",
     headers: {
       "Content-Type": "application/json",
       "x-secret-key": DASHBOARD_THIRDWEB_SECRET_KEY,
     } as Record<string, string>,
+    method: "GET",
+  });
+
+  if (!res.ok) {
+    const text = await res.text();
+    throw new Error(text);
+  }
+
+  const json = await res.json();
+  return json.data as Array<TokenMetadata>;
+}
+
+export async function addUniversalBridgeTokenRoute(props: {
+  chainId: number;
+  tokenAddress: string;
+  project: ProjectResponse;
+}) {
+  const authToken = await getAuthToken();
+  const url = new URL(`${UB_BASE_URL}/v1/tokens`);
+
+  const res = await fetch(url.toString(), {
+    body: JSON.stringify({
+      chainId: props.chainId,
+      tokenAddress: props.tokenAddress,
+    }),
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+      "Content-Type": "application/json",
+      "x-client-id": props.project.publishableKey,
+    } as Record<string, string>,
+    method: "POST",
   });
 
   if (!res.ok) {

apps/dashboard/src/@/api/usage/billing-preview.ts

@@ -0,0 +1,66 @@
+import "server-only";
+
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+
+type LineItem = {
+  quantity: number;
+  amountUsdCents: number;
+  unitAmountUsdCents: string;
+  description: string;
+};
+
+export type UsageCategory = {
+  category: string;
+  unitName: string;
+  lineItems: LineItem[];
+};
+
+type UsageApiResponse = {
+  result: UsageCategory[];
+  periodStart: string;
+  periodEnd: string;
+  planVersion: number;
+};
+
+export async function getBilledUsage(teamSlug: string) {
+  const authToken = await getAuthToken();
+  if (!authToken) {
+    throw new Error("No auth token found");
+  }
+  const response = await fetch(
+    new URL(
+      `/v1/teams/${teamSlug}/billing/billed-usage`,
+      NEXT_PUBLIC_THIRDWEB_API_HOST,
+    ),
+    {
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+      },
+      next: {
+        // revalidate this query once per minute (does not need to be more granular than that)
+        revalidate: 60,
+      },
+    },
+  );
+  if (!response.ok) {
+    // if the status is 404, the most likely reason is that the team is on a free plan
+    if (response.status === 404) {
+      return {
+        reason: "free_plan",
+        status: "error",
+      } as const;
+    }
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    } as const;
+  }
+  const data = (await response.json()) as UsageApiResponse;
+  return {
+    data,
+    status: "success",
+  } as const;
+}

apps/dashboard/src/@/api/usage/rpc.ts

@@ -1,58 +1,6 @@
 import "server-only";
 import { unstable_cache } from "next/cache";
-import { ANALYTICS_SERVICE_URL } from "../../constants/server-envs";
-
-export type RPCUsageDataItem = {
-  date: string;
-  usageType: "included" | "overage" | "rate-limit";
-  count: string;
-};
-
-export const fetchRPCUsage = unstable_cache(
-  async (params: {
-    teamId: string;
-    projectId?: string;
-    authToken: string;
-    from: string;
-    to: string;
-    period: "day" | "week" | "month" | "year" | "all";
-  }) => {
-    const analyticsEndpoint = ANALYTICS_SERVICE_URL;
-    const url = new URL(`${analyticsEndpoint}/v2/rpc/usage-types`);
-    url.searchParams.set("teamId", params.teamId);
-    if (params.projectId) {
-      url.searchParams.set("projectId", params.projectId);
-    }
-    url.searchParams.set("from", params.from);
-    url.searchParams.set("to", params.to);
-    url.searchParams.set("period", params.period);
-
-    const res = await fetch(url, {
-      headers: {
-        Authorization: `Bearer ${params.authToken}`,
-      },
-    });
-
-    if (!res.ok) {
-      const error = await res.text();
-      return {
-        ok: false as const,
-        error: error,
-      };
-    }
-
-    const resData = await res.json();
-
-    return {
-      ok: true as const,
-      data: resData.data as RPCUsageDataItem[],
-    };
-  },
-  ["rpc-usage"],
-  {
-    revalidate: 60 * 60, // 1 hour
-  },
-);
+import { ANALYTICS_SERVICE_URL } from "@/constants/server-envs";
 
 type Last24HoursRPCUsageApiResponse = {
   peakRate: {
@@ -75,11 +23,7 @@ type Last24HoursRPCUsageApiResponse = {
 };
 
 export const getLast24HoursRPCUsage = unstable_cache(
-  async (params: {
-    teamId: string;
-    projectId?: string;
-    authToken: string;
-  }) => {
+  async (params: { teamId: string; projectId?: string; authToken: string }) => {
     const analyticsEndpoint = ANALYTICS_SERVICE_URL;
     const url = new URL(`${analyticsEndpoint}/v2/rpc/24-hours`);
     url.searchParams.set("teamId", params.teamId);
@@ -96,16 +40,16 @@ export const getLast24HoursRPCUsage = unstable_cache(
     if (!res.ok) {
       const error = await res.text();
       return {
-        ok: false as const,
         error: error,
+        ok: false as const,
       };
     }
 
     const resData = await res.json();
 
     return {
-      ok: true as const,
       data: resData.data as Last24HoursRPCUsageApiResponse,
+      ok: true as const,
     };
   },
   ["rpc-usage-last-24-hours:v2"],

apps/dashboard/src/@/api/verified-domain.ts

@@ -1,8 +1,8 @@
 "use server";
 import "server-only";
 
-import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "../constants/public-envs";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+import { getAuthToken } from "./auth-token";
 
 export type VerifiedDomainResponse =
   | {
@@ -56,12 +56,12 @@ export async function createDomainVerification(
   const res = await fetch(
     `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${teamIdOrSlug}/verified-domain`,
     {
-      method: "POST",
       body: JSON.stringify({ domain }),
       headers: {
-        "Content-Type": "application/json",
         Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
       },
+      method: "POST",
     },
   );
 

apps/dashboard/src/@/api/webhook-configs.ts

@@ -0,0 +1,362 @@
+"use server";
+
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
+
+export interface WebhookConfig {
+  id: string;
+  teamId: string;
+  projectId: string;
+  destinationUrl: string;
+  description: string;
+  pausedAt: string | null;
+  webhookSecret: string;
+  createdAt: string;
+  updatedAt: string;
+  deletedAt: string | null;
+  topics: {
+    id: string;
+    serviceName: string;
+    description: string;
+    createdAt: string;
+    updatedAt: string;
+    deletedAt: string | null;
+    filters: object | null;
+  }[];
+}
+
+type WebhookConfigsResponse =
+  | {
+      data: WebhookConfig[];
+      status: "success";
+    }
+  | {
+      body: string;
+      reason: string;
+      status: "error";
+    };
+
+interface CreateWebhookConfigRequest {
+  topicIdsWithFilters: { id: string; filters: object | null }[];
+  destinationUrl: string;
+  description: string;
+  isPaused?: boolean;
+}
+
+type CreateWebhookConfigResponse =
+  | {
+      data: WebhookConfig;
+      status: "success";
+    }
+  | {
+      body: string;
+      reason: string;
+      status: "error";
+    };
+
+export interface Topic {
+  id: string;
+  serviceName: string;
+  description: string;
+  createdAt: string;
+  updatedAt: string;
+  deletedAt: string | null;
+}
+
+type TopicsResponse =
+  | {
+      data: Topic[];
+      status: "success";
+    }
+  | {
+      body: string;
+      reason: string;
+      status: "error";
+    };
+
+interface UpdateWebhookConfigRequest {
+  destinationUrl?: string;
+  topicIdsWithFilters?: { id: string; filters: object | null }[];
+  description?: string;
+  isPaused?: boolean;
+}
+
+type UpdateWebhookConfigResponse =
+  | {
+      data: WebhookConfig;
+      status: "success";
+    }
+  | {
+      body: string;
+      reason: string;
+      status: "error";
+    };
+
+type DeleteWebhookConfigResponse =
+  | {
+      data: WebhookConfig;
+      status: "success";
+    }
+  | {
+      body: string;
+      reason: string;
+      status: "error";
+    };
+
+export async function getWebhookConfigs(props: {
+  teamIdOrSlug: string;
+  projectIdOrSlug: string;
+}): Promise<WebhookConfigsResponse> {
+  const authToken = await getAuthToken();
+
+  if (!authToken) {
+    return {
+      body: "Authentication required",
+      reason: "no_auth_token",
+      status: "error",
+    };
+  }
+
+  const response = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${props.teamIdOrSlug}/projects/${props.projectIdOrSlug}/webhook-configs`,
+    {
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+        "Content-Type": "application/json",
+      },
+      method: "GET",
+    },
+  );
+
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    };
+  }
+
+  const result = await response.json();
+  return {
+    data: result.data,
+    status: "success",
+  };
+}
+
+export async function createWebhookConfig(props: {
+  teamIdOrSlug: string;
+  projectIdOrSlug: string;
+  config: CreateWebhookConfigRequest;
+}): Promise<CreateWebhookConfigResponse> {
+  const authToken = await getAuthToken();
+
+  if (!authToken) {
+    return {
+      body: "Authentication required",
+      reason: "no_auth_token",
+      status: "error",
+    };
+  }
+
+  const response = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${props.teamIdOrSlug}/projects/${props.projectIdOrSlug}/webhook-configs`,
+    {
+      body: JSON.stringify(props.config),
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+    },
+  );
+
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    };
+  }
+
+  const result = await response.json();
+  return {
+    data: result.data,
+    status: "success",
+  };
+}
+
+export async function getAvailableTopics(): Promise<TopicsResponse> {
+  const authToken = await getAuthToken();
+
+  if (!authToken) {
+    return {
+      body: "Authentication required",
+      reason: "no_auth_token",
+      status: "error",
+    };
+  }
+
+  const response = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/webhook-topics`,
+    {
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+        "Content-Type": "application/json",
+      },
+      method: "GET",
+    },
+  );
+
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    };
+  }
+
+  const result = await response.json();
+  return {
+    data: result.data,
+    status: "success",
+  };
+}
+
+export async function updateWebhookConfig(props: {
+  teamIdOrSlug: string;
+  projectIdOrSlug: string;
+  webhookConfigId: string;
+  config: UpdateWebhookConfigRequest;
+}): Promise<UpdateWebhookConfigResponse> {
+  const authToken = await getAuthToken();
+
+  if (!authToken) {
+    return {
+      body: "Authentication required",
+      reason: "no_auth_token",
+      status: "error",
+    };
+  }
+
+  const response = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${props.teamIdOrSlug}/projects/${props.projectIdOrSlug}/webhook-configs/${props.webhookConfigId}`,
+    {
+      body: JSON.stringify(props.config),
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+        "Content-Type": "application/json",
+      },
+      method: "PATCH",
+    },
+  );
+
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    };
+  }
+
+  const result = await response.json();
+  return {
+    data: result.data,
+    status: "success",
+  };
+}
+
+export async function deleteWebhookConfig(props: {
+  teamIdOrSlug: string;
+  projectIdOrSlug: string;
+  webhookConfigId: string;
+}): Promise<DeleteWebhookConfigResponse> {
+  const authToken = await getAuthToken();
+
+  if (!authToken) {
+    return {
+      body: "Authentication required",
+      reason: "no_auth_token",
+      status: "error",
+    };
+  }
+
+  const response = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${props.teamIdOrSlug}/projects/${props.projectIdOrSlug}/webhook-configs/${props.webhookConfigId}`,
+    {
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+        "Content-Type": "application/json",
+      },
+      method: "DELETE",
+    },
+  );
+
+  if (!response.ok) {
+    const body = await response.text();
+    return {
+      body,
+      reason: "unknown",
+      status: "error",
+    };
+  }
+
+  const result = await response.json();
+  return {
+    data: result.data,
+    status: "success",
+  };
+}
+
+type TestDestinationUrlResponse =
+  | {
+      result: {
+        httpStatusCode: number;
+        httpResponseBody: string;
+      };
+      status: "success";
+    }
+  | {
+      body: string;
+      reason: string;
+      status: "error";
+    };
+
+export async function testDestinationUrl(props: {
+  teamIdOrSlug: string;
+  projectIdOrSlug: string;
+  destinationUrl: string;
+}): Promise<TestDestinationUrlResponse> {
+  const authToken = await getAuthToken();
+
+  if (!authToken) {
+    return {
+      body: "Authentication required",
+      reason: "no_auth_token",
+      status: "error",
+    };
+  }
+
+  const resp = await fetch(
+    `${NEXT_PUBLIC_THIRDWEB_API_HOST}/v1/teams/${props.teamIdOrSlug}/projects/${props.projectIdOrSlug}/webhook-configs/test-destination-url`,
+    {
+      body: JSON.stringify({ destinationUrl: props.destinationUrl }),
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+        "Content-Type": "application/json",
+      },
+      method: "POST",
+    },
+  );
+  if (!resp.ok) {
+    return {
+      body: await resp.text(),
+      reason: "unknown",
+      status: "error",
+    };
+  }
+  return await resp.json();
+}

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

@@ -1,3 +1,4 @@
+import { differenceInCalendarDays, format, subDays } from "date-fns";
 import { DatePickerWithRange } from "@/components/ui/DatePickerWithRange";
 import {
   Select,
@@ -7,12 +8,13 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { normalizeTime } from "@/lib/time";
-import { differenceInCalendarDays, format, subDays } from "date-fns";
+import { cn } from "@/lib/utils";
 
 export function DateRangeSelector(props: {
   range: Range;
   setRange: (range: Range) => void;
   popoverAlign?: "start" | "end" | "center";
+  className?: string;
 }) {
   const { range, setRange } = props;
   const daysDiff = differenceInCalendarDays(range.to, range.from);
@@ -26,30 +28,15 @@ export function DateRangeSelector(props: {
 
   return (
     <DatePickerWithRange
+      className={cn("w-auto bg-card", props.className)}
       from={range.from}
-      to={range.to}
-      popoverAlign={props.popoverAlign}
-      setFrom={(from) =>
-        setRange({
-          from,
-          to: range.to,
-          type: "custom",
-        })
-      }
-      setTo={(to) =>
-        setRange({
-          from: range.from,
-          to,
-          type: "custom",
-        })
-      }
       header={
         <div className="mb-2 border-border border-b p-4">
           <Select
-            value={rangeType}
             onValueChange={(id: DurationId) => {
               setRange(getLastNDaysRange(id));
             }}
+            value={rangeType}
           >
             <SelectTrigger className="flex bg-transparent">
               <SelectValue placeholder="Select" />
@@ -72,7 +59,22 @@ export function DateRangeSelector(props: {
         </div>
       }
       labelOverride={rangeLabel}
-      className="w-auto bg-card"
+      popoverAlign={props.popoverAlign}
+      setFrom={(from) =>
+        setRange({
+          from,
+          to: range.to,
+          type: "custom",
+        })
+      }
+      setTo={(to) =>
+        setRange({
+          from: range.from,
+          to,
+          type: "custom",
+        })
+      }
+      to={range.to}
     />
   );
 }
@@ -86,10 +88,10 @@ export function getLastNDaysRange(id: DurationId) {
   const todayDate = new Date(Date.now() + 1000 * 60 * 60 * 24); // add 1 day to avoid timezone issues
 
   const value: Range = {
-    type: id,
     from: subDays(todayDate, durationInfo.days),
-    to: todayDate,
     label: durationInfo.name,
+    to: todayDate,
+    type: id,
   };
 
   return value;
@@ -97,24 +99,24 @@ export function getLastNDaysRange(id: DurationId) {
 
 const durationPresets = [
   {
-    name: "Last 7 Days",
-    id: "last-7",
     days: 7,
+    id: "last-7",
+    name: "Last 7 Days",
   },
   {
-    name: "Last 30 Days",
-    id: "last-30",
     days: 30,
+    id: "last-30",
+    name: "Last 30 Days",
   },
   {
-    name: "Last 60 Days",
-    id: "last-60",
     days: 60,
+    id: "last-60",
+    name: "Last 60 Days",
   },
   {
-    name: "Last 120 Days",
-    id: "last-120",
     days: 120,
+    id: "last-120",
+    name: "Last 120 Days",
   },
 ] as const;
 

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

@@ -0,0 +1,104 @@
+"use client";
+import { useId, useMemo } from "react";
+import { Area, AreaChart, Bar, BarChart } from "recharts";
+import { type ChartConfig, ChartContainer } from "@/components/ui/chart";
+import { LoadingDots } from "@/components/ui/LoadingDots";
+import { cn } from "@/lib/utils";
+
+type FakeCartData = {
+  value: number;
+};
+
+function generateRandomData(): FakeCartData[] {
+  return Array.from({ length: 30 }, () => ({
+    value: Math.floor(Math.random() * 100 + 30),
+  }));
+}
+
+const skeletonChartConfig = {
+  value: {
+    color: "hsl(var(--muted)/90%)",
+    label: "Value",
+  },
+} satisfies ChartConfig;
+
+export function EmptyChartState({
+  children,
+  type,
+}: {
+  children?: React.ReactNode;
+  type: "bar" | "area";
+}) {
+  const barChartData = useMemo(() => generateRandomData(), []);
+
+  return (
+    <div className="relative z-0 h-full w-full">
+      <div className="absolute inset-0 z-[1] flex flex-col items-center justify-center font-medium text-base text-muted-foreground">
+        {children ?? "No data available"}
+      </div>
+      <SkeletonBarChart data={barChartData} type={type} />
+    </div>
+  );
+}
+
+export function LoadingChartState({ className }: { className?: string }) {
+  return (
+    <div
+      className={cn(
+        "pointer-events-none flex h-full w-full items-center justify-center rounded-lg bg-muted/30",
+        className,
+      )}
+    >
+      <LoadingDots />
+    </div>
+  );
+}
+
+function SkeletonBarChart(props: {
+  data: FakeCartData[];
+  type: "bar" | "area";
+}) {
+  const fillAreaSkeletonId = useId();
+  return (
+    <ChartContainer
+      className="pointer-events-none h-full w-full blur-[5px]"
+      config={skeletonChartConfig}
+    >
+      {props.type === "bar" ? (
+        <BarChart
+          data={props.data}
+          margin={{
+            top: 20,
+          }}
+        >
+          <Bar dataKey="value" fill="var(--color-value)" radius={8} />
+        </BarChart>
+      ) : (
+        <AreaChart
+          data={props.data}
+          margin={{
+            top: 20,
+          }}
+        >
+          <defs>
+            <linearGradient id={fillAreaSkeletonId} x1="0" x2="0" y1="0" y2="1">
+              <stop
+                offset="5%"
+                stopColor={"hsl(var(--muted-foreground)/0.5)"}
+                stopOpacity={0.8}
+              />
+              <stop offset="95%" stopColor="transparent" stopOpacity={0.1} />
+            </linearGradient>
+          </defs>
+          <Area
+            dataKey="value"
+            fill={`url(#${fillAreaSkeletonId})`}
+            radius={8}
+            stroke="hsl(var(--muted-foreground))"
+            type="natural"
+          />
+        </AreaChart>
+      )}
+    </ChartContainer>
+  );
+}

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

@@ -14,10 +14,10 @@ export function IntervalSelector(props: {
 }) {
   return (
     <Select
-      value={props.intervalType}
       onValueChange={(value: "day" | "week") => {
         props.setIntervalType(value);
       }}
+      value={props.intervalType}
     >
       <SelectTrigger
         className={cn("w-auto bg-card md:w-[120px]", props.className)}

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

@@ -1,22 +1,25 @@
 "use client";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { useQuery } from "@tanstack/react-query";
-import {
-  DateRangeSelector,
-  getLastNDaysRange,
-} from "components/analytics/date-range-selector";
+import { usePathname, useSearchParams } from "next/navigation";
+import { useState } from "react";
 import type {
   DurationId,
   Range,
-} from "components/analytics/date-range-selector";
-import { IntervalSelector } from "components/analytics/interval-selector";
-import { usePathname, useSearchParams } from "next/navigation";
-import { useState } from "react";
+} from "@/components/analytics/date-range-selector";
+import {
+  DateRangeSelector,
+  getLastNDaysRange,
+} from "@/components/analytics/date-range-selector";
+import { IntervalSelector } from "@/components/analytics/interval-selector";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
 
 export function RangeSelector({
   range,
   interval,
-}: { range?: Range; interval: "day" | "week" }) {
+}: {
+  range?: Range;
+  interval: "day" | "week";
+}) {
   const pathname = usePathname();
   const searchParams = useSearchParams();
   const router = useDashboardRouter();
@@ -26,7 +29,6 @@ export function RangeSelector({
   const [localInterval, setInterval] = useState<"day" | "week">(interval);
 
   useQuery({
-    queryKey: ["analytics-range", searchParams?.toString(), range],
     queryFn: async () => {
       if (range) {
         setRange(range);
@@ -46,11 +48,11 @@ export function RangeSelector({
       }
       return getLastNDaysRange("last-120");
     },
+    queryKey: ["analytics-range", searchParams?.toString(), range],
   });
 
   // prefetch for each interval and default range
   useQuery({
-    queryKey: ["analytics-range", searchParams?.toString()],
     queryFn: async () => {
       const newSearchParams = new URLSearchParams(searchParams || {});
       for (const interval of ["day", "week"] as const) {
@@ -70,11 +72,13 @@ export function RangeSelector({
       }
       return true;
     },
+    queryKey: ["analytics-range", searchParams?.toString()],
   });
 
   return (
-    <div className="flex justify-end gap-4">
+    <div className="flex justify-end gap-3 flex-col lg:flex-row">
       <DateRangeSelector
+        className="rounded-full"
         range={localRange}
         setRange={(newRange) => {
           setRange(newRange);
@@ -86,7 +90,7 @@ export function RangeSelector({
         }}
       />
       <IntervalSelector
-        className="bg-card"
+        className="bg-card rounded-full"
         intervalType={localInterval}
         setIntervalType={(newInterval) => {
           setInterval(newInterval);

apps/dashboard/src/@/components/analytics/stat.tsx

@@ -1,4 +1,4 @@
-import { Skeleton } from "../../@/components/ui/skeleton";
+import { Skeleton } from "@/components/ui/skeleton";
 
 export const StatCard: React.FC<{
   label: string;

apps/dashboard/src/@/components/batch-upload/batch-lazy-mint.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
 import {
   Alert,
   AlertIcon,
@@ -12,27 +11,24 @@ import {
   Textarea,
 } from "@chakra-ui/react";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { TransactionButton } from "components/buttons/TransactionButton";
-import { FileInput } from "components/shared/FileInput";
-import { useImageFileOrUrl } from "hooks/useImageFileOrUrl";
+import { Button } from "chakra/button";
+import { FormErrorMessage, FormHelperText, FormLabel } from "chakra/form";
+import { Heading } from "chakra/heading";
+import { Text } from "chakra/text";
 import { ChevronLeftIcon, EyeIcon, EyeOffIcon } from "lucide-react";
 import { useRef, useState } from "react";
 import { useDropzone } from "react-dropzone";
 import { useForm } from "react-hook-form";
+import type { ThirdwebClient } from "thirdweb";
 import type { CreateDelayedRevealBatchParams } from "thirdweb/extensions/erc721";
 import type { NFTInput } from "thirdweb/utils";
-import {
-  Button,
-  FormErrorMessage,
-  FormHelperText,
-  FormLabel,
-  Heading,
-  Text,
-  TrackedLink,
-} from "tw-components";
-import type { ComponentWithChildren } from "types/component-with-children";
-import { processInputData, shuffleData } from "utils/batch";
 import { z } from "zod";
+import { FileInput } from "@/components/blocks/FileInput";
+import { TransactionButton } from "@/components/tx-button";
+import { Checkbox, CheckboxWithLabel } from "@/components/ui/checkbox";
+import { UnderlineLink } from "@/components/ui/UnderlineLink";
+import type { ComponentWithChildren } from "@/types/component-with-children";
+import { processInputData, shuffleData } from "@/utils/batch";
 import { BatchTable } from "./batch-table";
 import { SelectOption } from "./lazy-mint-form/select-option";
 import { UploadStep } from "./upload-step";
@@ -53,33 +49,34 @@ interface BatchLazyMintEVMProps {
   canCreateDelayedRevealBatch: boolean;
   onSubmit: (formData: SubmitType) => Promise<unknown>;
   chainId: number;
+  client: ThirdwebClient;
 }
 
 type BatchLazyMintProps = BatchLazyMintEVMProps;
 
 const BatchLazyMintFormSchema = z
   .object({
-    // delayed reveal placeholder
-    placeHolder: z
-      .object({
-        name: z.string().min(1, "A name is required"),
-        image: z.any().optional(),
-        description: z.string().or(z.string().length(0)).optional(),
-      })
-      .optional(),
-    // delayed reveal password logic
-    password: z.string().min(1, "A password is required.").optional(),
     confirmPassword: z
       .string()
       .min(1, "Please confirm your password.")
       .optional(),
 
-    // shared logic
-    shuffle: z.boolean().default(false),
-    revealType: z.literal("instant").or(z.literal("delayed")).optional(),
-
     // metadata
     metadatas: z.array(z.any()),
+    // delayed reveal password logic
+    password: z.string().min(1, "A password is required.").optional(),
+    // delayed reveal placeholder
+    placeHolder: z
+      .object({
+        description: z.string().or(z.string().length(0)).optional(),
+        image: z.any().optional(),
+        name: z.string().min(1, "A name is required"),
+      })
+      .optional(),
+    revealType: z.literal("instant").or(z.literal("delayed")).optional(),
+
+    // shared logic
+    shuffle: z.boolean().default(false),
   })
   .refine((data) => data.password === data.confirmPassword, {
     message: "Passwords don't match",
@@ -92,12 +89,12 @@ type BatchLazyMintFormType = z.output<typeof BatchLazyMintFormSchema> & {
 
 function useBatchLazyMintForm() {
   return useForm<BatchLazyMintFormType>({
-    resolver: zodResolver(BatchLazyMintFormSchema),
     defaultValues: {
       metadatas: [],
       revealType: undefined,
       shuffle: false,
     },
+    resolver: zodResolver(BatchLazyMintFormSchema),
   });
 }
 
@@ -149,8 +146,8 @@ export const BatchLazyMint: ComponentWithChildren<
         // check submit is instant
         if (data.revealType === "instant") {
           return props.onSubmit({
-            revealType: "instant",
             data: { metadatas: shuffledMetadatas },
+            revealType: "instant",
           });
         }
         // validate password
@@ -170,16 +167,16 @@ export const BatchLazyMint: ComponentWithChildren<
         }
         // submit
         return props.onSubmit({
-          revealType: "delayed",
           data: {
             metadata: shuffledMetadatas,
             password: data.password,
             placeholderMetadata: {
-              name: data.placeHolder?.name,
               description: data.placeHolder?.description,
               image: data.placeHolder?.image,
+              name: data.placeHolder?.name,
             },
           },
+          revealType: "delayed",
         });
       })}
     >
@@ -188,9 +185,10 @@ export const BatchLazyMint: ComponentWithChildren<
           {nftMetadatas.length > 0 ? (
             <>
               <BatchTable
-                portalRef={paginationPortalRef}
+                client={props.client}
                 data={nftMetadatas}
                 nextTokenIdToMint={props.nextTokenIdToMint}
+                portalRef={paginationPortalRef}
               />
               <div className="border-border border-t">
                 <div className="flex flex-col items-center justify-between p-0 md:flex-row md:p-4">
@@ -220,8 +218,8 @@ export const BatchLazyMint: ComponentWithChildren<
             </>
           ) : (
             <UploadStep
-              getRootProps={getRootProps}
               getInputProps={getInputProps}
+              getRootProps={getRootProps}
               hasFailed={hasError}
               isDragActive={isDragActive}
             />
@@ -229,30 +227,31 @@ export const BatchLazyMint: ComponentWithChildren<
         </div>
       ) : (
         <>
-          <Flex align="center" justify="space-between" py={4} w="100%" mb={2}>
+          <Flex align="center" justify="space-between" mb={2} py={4} w="100%">
             <div className="flex flex-row items-center gap-2">
               <Button
                 className="text-muted-foreground"
-                variant="ghost"
                 onClick={() => setStep(0)}
+                variant="ghost"
               >
                 <ChevronLeftIcon className="size-5 cursor-pointer" />
               </Button>
-              <Heading size="title.md" className="my-auto">
+              <Heading className="my-auto" size="title.md">
                 When will you reveal your NFTs?
               </Heading>
             </div>
           </Flex>
           <SelectReveal
-            form={form}
             canCreateDelayedRevealBatch={props.canCreateDelayedRevealBatch}
+            client={props.client}
+            form={form}
           />
           {form.watch("revealType") && (
             <>
               <CheckboxWithLabel>
                 <Checkbox
-                  className="mt-3"
                   checked={form.watch("shuffle")}
+                  className="mt-3"
                   onCheckedChange={(val) => form.setValue("shuffle", !!val)}
                 />
                 <div className="flex flex-col items-center gap-1 md:flex-row">
@@ -262,13 +261,14 @@ export const BatchLazyMint: ComponentWithChildren<
               </CheckboxWithLabel>
               <div className="w-full md:w-[61%]">
                 <TransactionButton
-                  txChainID={props.chainId}
                   className="mt-4 w-full"
-                  transactionCount={1}
+                  client={props.client}
                   disabled={!nftMetadatas.length}
-                  type="submit"
-                  isPending={form.formState.isSubmitting}
                   isLoggedIn={props.isLoggedIn}
+                  isPending={form.formState.isSubmitting}
+                  transactionCount={1}
+                  txChainID={props.chainId}
+                  type="submit"
                 >
                   {form.formState.isSubmitting
                     ? `Uploading ${nftMetadatas.length} NFTs`
@@ -276,15 +276,15 @@ export const BatchLazyMint: ComponentWithChildren<
                 </TransactionButton>
                 {props.children}
               </div>
-              <Text size="body.sm" mt={2}>
-                <TrackedLink
+              <Text mt={2} size="body.sm">
+                <UnderlineLink
+                  className="text-primary-500"
                   href="https://support.thirdweb.com/dashboard/n5evQ4EfEjEifczEQaZ1hL/batch-upload-troubleshooting/5WMQFqfaUTU1C8NM8FtJ2X"
-                  isExternal
-                  category="batch-upload"
-                  label="issues"
+                  rel="noopener noreferrer"
+                  target="_blank"
                 >
                   Experiencing issues uploading your files?
-                </TrackedLink>
+                </UnderlineLink>
               </Text>
             </>
           )}
@@ -297,42 +297,45 @@ export const BatchLazyMint: ComponentWithChildren<
 interface SelectRevealProps {
   form: ReturnType<typeof useBatchLazyMintForm>;
   canCreateDelayedRevealBatch: boolean;
+  client: ThirdwebClient;
 }
 
 const SelectReveal: React.FC<SelectRevealProps> = ({
   form,
+  client,
   canCreateDelayedRevealBatch,
 }) => {
   const [show, setShow] = useState(false);
 
-  const imageUrl = useImageFileOrUrl(form.watch("placeHolder.image"));
+  const imageUrl = form.watch("placeHolder.image");
+
   return (
     <Flex flexDir="column">
       <Flex
+        flexDir={{ base: "column", md: "row" }}
         gap={{ base: 3, md: 6 }}
         mb={6}
-        flexDir={{ base: "column", md: "row" }}
       >
         <SelectOption
-          name="Reveal upon mint"
           description="Collectors will immediately see the final NFT when they complete the minting"
           isActive={form.watch("revealType") === "instant"}
+          name="Reveal upon mint"
           onClick={() => form.setValue("revealType", "instant")}
         />
         <SelectOption
-          name="Delayed Reveal"
           description="Collectors will mint your placeholder image, then you reveal at a later time"
-          isActive={form.watch("revealType") === "delayed"}
-          onClick={() => form.setValue("revealType", "delayed")}
           disabled={!canCreateDelayedRevealBatch}
           disabledText="This contract doesn't implement Delayed Reveal"
+          isActive={form.watch("revealType") === "delayed"}
+          name="Delayed Reveal"
+          onClick={() => form.setValue("revealType", "delayed")}
         />
       </Flex>
       <div className="flex flex-col gap-3">
         {form.watch("revealType") === "delayed" && (
           <>
             <Heading size="title.sm">Let&apos;s set a password</Heading>
-            <Alert status="warning" borderRadius="lg">
+            <Alert borderRadius="lg" status="warning">
               <AlertIcon />
               You&apos;ll need this password to reveal your NFTs. Please save it
               somewhere safe.
@@ -343,10 +346,10 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
               gap={{ base: 4, md: 0 }}
             >
               <FormControl
-                isRequired
                 isInvalid={
                   !!form.getFieldState("password", form.formState).error
                 }
+                isRequired
                 mr={4}
               >
                 <FormLabel>Password</FormLabel>
@@ -359,13 +362,13 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
                   <InputRightElement cursor="pointer">
                     {show ? (
                       <EyeIcon
-                        onClick={() => setShow(!show)}
                         className="size-3"
+                        onClick={() => setShow(!show)}
                       />
                     ) : (
                       <EyeOffIcon
-                        onClick={() => setShow(!show)}
                         className="size-3"
+                        onClick={() => setShow(!show)}
                       />
                     )}
                   </InputRightElement>
@@ -379,10 +382,10 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
                 </FormErrorMessage>
               </FormControl>
               <FormControl
-                isRequired
                 isInvalid={
                   !!form.getFieldState("confirmPassword", form.formState).error
                 }
+                isRequired
               >
                 <FormLabel>Confirm password</FormLabel>
                 <Input
@@ -410,12 +413,13 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
                 <div className="w-auto md:w-[350px]">
                   <FileInput
                     accept={{ "image/*": [] }}
-                    value={imageUrl}
-                    showUploadButton
+                    className="rounded border border-border transition-all duration-200"
+                    client={client}
                     setValue={(file) =>
                       form.setValue("placeHolder.image", file)
                     }
-                    className="rounded border border-border transition-all duration-200"
+                    showUploadButton
+                    value={imageUrl}
                   />
                 </div>
                 <FormHelperText>
@@ -429,10 +433,10 @@ const SelectReveal: React.FC<SelectRevealProps> = ({
                 </FormErrorMessage>
               </FormControl>
               <FormControl
-                isRequired
                 isInvalid={
                   !!form.getFieldState("placeHolder.name", form.formState).error
                 }
+                isRequired
               >
                 <FormLabel>Name</FormLabel>
                 <Input

apps/dashboard/src/@/components/batch-upload/batch-table.tsx

@@ -1,12 +1,9 @@
-import { CodeClient } from "@/components/ui/code/code.client";
-import { ToolTipLabel } from "@/components/ui/tooltip";
+/** biome-ignore-all lint/nursery/noNestedComponentDefinitions: FIXME */
+
+import { FilePreview } from "@app/team/[team_slug]/[project_slug]/(sidebar)/tokens/create/_common/file-preview";
 import {
-  Box,
-  type BoxProps,
   Flex,
   IconButton,
-  Image,
-  type ImageProps,
   Portal,
   Select,
   Table,
@@ -17,8 +14,6 @@ import {
   Thead,
   Tr,
 } from "@chakra-ui/react";
-import { useImageFileOrUrl } from "hooks/useImageFileOrUrl";
-import { replaceIpfsUrl } from "lib/sdk";
 import {
   ChevronFirstIcon,
   ChevronLastIcon,
@@ -27,84 +22,58 @@ import {
 } from "lucide-react";
 import { useMemo } from "react";
 import { type Column, usePagination, useTable } from "react-table";
+import type { ThirdwebClient } from "thirdweb";
 import type { NFTInput } from "thirdweb/utils";
-import { useThirdwebClient } from "../../@/constants/thirdweb.client";
+import { CodeClient } from "@/components/ui/code/code.client";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
-const FileImage: React.FC<ImageProps> = ({ src, ...props }) => {
-  const client = useThirdwebClient();
-  const img = useImageFileOrUrl(
-    typeof src === "string" && src.startsWith("ipfs://")
-      ? replaceIpfsUrl(src, client)
-      : src,
-  );
-  return <Image alt="" {...props} src={img} />;
-};
-
-const FileVideo: React.FC<
-  BoxProps &
-    Omit<React.ComponentProps<"video">, "ref" | "src"> & { src: string | File }
-> = ({ src, ...props }) => {
-  const client = useThirdwebClient();
-  const video = useImageFileOrUrl(
-    typeof src === "string" && src.startsWith("ipfs://")
-      ? replaceIpfsUrl(src, client)
-      : src,
-  );
-  return <Box as="video" {...props} src={video} />;
-};
 interface BatchTableProps {
   data: NFTInput[];
   portalRef: React.RefObject<HTMLDivElement | null>;
   nextTokenIdToMint?: bigint;
+  client: ThirdwebClient;
 }
 
 export const BatchTable: React.FC<BatchTableProps> = ({
   data,
   portalRef,
   nextTokenIdToMint,
+  client,
 }) => {
   const columns = useMemo(() => {
     let cols: Column<NFTInput>[] = [];
     if (nextTokenIdToMint !== undefined) {
       cols = cols.concat({
-        Header: "Token ID",
         accessor: (_row, index) => String(nextTokenIdToMint + BigInt(index)),
+        Header: "Token ID",
       });
     }
 
     cols = cols.concat([
       {
-        Header: "Image",
         accessor: (row) => row.image,
         Cell: ({ cell: { value } }: { cell: { value?: string } }) => (
-          <FileImage
-            flexShrink={0}
-            boxSize={24}
-            objectFit="contain"
-            src={value}
-            alt=""
+          <FilePreview
+            className="size-24 shrink-0 rounded-lg object-contain"
+            client={client}
+            srcOrFile={value}
           />
         ),
+        Header: "Image",
       },
       {
-        Header: "Animation Url",
         accessor: (row) => row.animation_url,
         Cell: ({ cell: { value } }: { cell: { value?: string } }) => (
-          <FileVideo
-            flexShrink={0}
-            boxSize={24}
-            objectFit="contain"
-            src={value || ""}
-            autoPlay
-            playsInline
-            muted
-            loop
+          <FilePreview
+            className="size-24 shrink-0 rounded-lg"
+            client={client}
+            srcOrFile={value}
           />
         ),
+        Header: "Animation Url",
       },
-      { Header: "Name", accessor: (row) => row.name },
+      { accessor: (row) => row.name, Header: "Name" },
       {
-        Header: "Description",
         accessor: (row) => (
           <ToolTipLabel label={row.description}>
             <p className="line-clamp-6 whitespace-pre-wrap">
@@ -112,9 +81,9 @@ export const BatchTable: React.FC<BatchTableProps> = ({
             </p>
           </ToolTipLabel>
         ),
+        Header: "Description",
       },
       {
-        Header: "Attributes",
         accessor: (row) => row.attributes || row.properties,
         // biome-ignore lint/suspicious/noExplicitAny: FIXME
         Cell: ({ cell }: { cell: any }) =>
@@ -125,12 +94,13 @@ export const BatchTable: React.FC<BatchTableProps> = ({
               scrollableClassName="max-w-[300px]"
             />
           ) : null,
+        Header: "Attributes",
       },
-      { Header: "External URL", accessor: (row) => row.external_url },
-      { Header: "Background Color", accessor: (row) => row.background_color },
+      { accessor: (row) => row.external_url, Header: "External URL" },
+      { accessor: (row) => row.background_color, Header: "Background Color" },
     ]);
     return cols;
-  }, [nextTokenIdToMint]);
+  }, [nextTokenIdToMint, client]);
 
   const {
     getTableProps,
@@ -156,8 +126,8 @@ export const BatchTable: React.FC<BatchTableProps> = ({
       columns,
       data,
       initialState: {
-        pageSize: 50,
         pageIndex: 0,
+        pageSize: 50,
       },
     },
     // will be fixed with @tanstack/react-table v8
@@ -168,7 +138,7 @@ export const BatchTable: React.FC<BatchTableProps> = ({
   // Render the UI for your table
   return (
     <Flex flexGrow={1} overflow="auto">
-      <TableContainer maxW="100%">
+      <TableContainer className="w-full" maxW="100%">
         <Table {...getTableProps()}>
           <Thead>
             {headerGroups.map((headerGroup, index) => (
@@ -191,8 +161,8 @@ export const BatchTable: React.FC<BatchTableProps> = ({
               return (
                 <Tr
                   {...row.getRowProps()}
-                  borderBottomWidth={1}
                   _last={{ borderBottomWidth: 0 }}
+                  borderBottomWidth={1}
                   // biome-ignore lint/suspicious/noArrayIndexKey: FIXME
                   key={rowIndex}
                 >
@@ -219,15 +189,15 @@ export const BatchTable: React.FC<BatchTableProps> = ({
         <div className="flex w-full items-center justify-center">
           <div className="flex flex-row items-center gap-2">
             <IconButton
-              isDisabled={!canPreviousPage}
               aria-label="first page"
               icon={<ChevronFirstIcon className="size-4" />}
+              isDisabled={!canPreviousPage}
               onClick={() => gotoPage(0)}
             />
             <IconButton
-              isDisabled={!canPreviousPage}
               aria-label="previous page"
               icon={<ChevronLeftIcon className="size-4" />}
+              isDisabled={!canPreviousPage}
               onClick={() => previousPage()}
             />
             <p className="whitespace-nowrap">
@@ -235,15 +205,15 @@ export const BatchTable: React.FC<BatchTableProps> = ({
               <strong>{pageOptions.length}</strong>
             </p>
             <IconButton
-              isDisabled={!canNextPage}
               aria-label="next page"
               icon={<ChevronRightIcon className="size-4" />}
+              isDisabled={!canNextPage}
               onClick={() => nextPage()}
             />
             <IconButton
-              isDisabled={!canNextPage}
               aria-label="last page"
               icon={<ChevronLastIcon className="size-4" />}
+              isDisabled={!canNextPage}
               onClick={() => gotoPage(pageCount - 1)}
             />
 

apps/dashboard/src/@/components/batch-upload/lazy-mint-form/select-option.tsx

@@ -0,0 +1,85 @@
+import { InfoIcon } from "lucide-react";
+import type { JSX, MouseEventHandler } from "react";
+import { Card } from "@/components/ui/card";
+import { ToolTipLabel } from "@/components/ui/tooltip";
+import { cn } from "@/lib/utils";
+
+interface SelectOptionProps extends React.HTMLAttributes<HTMLDivElement> {
+  name: string;
+  description?: string;
+  isActive?: boolean;
+  onClick: MouseEventHandler<HTMLDivElement>;
+  disabled?: boolean;
+  disabledText?: string;
+  infoText?: string | JSX.Element;
+  className?: string;
+}
+
+export const SelectOption: React.FC<SelectOptionProps> = ({
+  name,
+  description,
+  isActive = true,
+  onClick,
+  disabled,
+  disabledText,
+  infoText,
+  className,
+  ...divProps
+}) => {
+  return (
+    <ToolTipLabel
+      label={
+        disabled ? (
+          <Card className="bg-muted p-3">
+            <p className="text-sm">{disabledText}</p>
+          </Card>
+        ) : undefined
+      }
+    >
+      <Card
+        className={cn(
+          "flex flex-col gap-2 rounded-md p-5 md:w-[350px]",
+          disabled
+            ? "pointer-events-none cursor-not-allowed bg-muted"
+            : "cursor-pointer",
+          isActive && "border-primary",
+          className,
+        )}
+        onClick={onClick}
+        {...divProps}
+      >
+        <div className="flex flex-row justify-between">
+          <div className="flex flex-row items-start">
+            <div className="mt-0.5 mr-2.5 flex h-4 w-4 items-center justify-center rounded-full border border-inverted text-inverted">
+              {isActive && <div className="h-2 w-2 rounded-full bg-inverted" />}
+            </div>
+            <div className="ml-4 flex flex-col gap-2 self-start">
+              <h4
+                className={cn(
+                  "font-semibold text-sm",
+                  disabled && "text-gray-600",
+                )}
+              >
+                {name}
+              </h4>
+              {description && <p className="mt-1 text-sm">{description}</p>}
+            </div>
+          </div>
+          {infoText && (
+            <ToolTipLabel
+              label={
+                <Card className="bg-muted p-3">
+                  <p className="text-sm">{infoText}</p>
+                </Card>
+              }
+            >
+              <div className="flex items-center">
+                <InfoIcon className="size-4" />
+              </div>
+            </ToolTipLabel>
+          )}
+        </div>
+      </Card>
+    </ToolTipLabel>
+  );
+};

apps/dashboard/src/@/components/batch-upload/upload-step.tsx

@@ -1,7 +1,7 @@
-import { UnorderedList } from "@/components/ui/List/List";
-import { InlineCode } from "@/components/ui/inline-code";
-import { cn } from "@/lib/utils";
 import { UploadIcon } from "lucide-react";
+import { InlineCode } from "@/components/ui/inline-code";
+import { UnorderedList } from "@/components/ui/List/List";
+import { cn } from "@/lib/utils";
 
 interface UploadStepProps {
   // biome-ignore lint/suspicious/noExplicitAny: FIXME
@@ -61,16 +61,16 @@ export const UploadStep: React.FC<UploadStepProps> = ({
           <li>
             Files <em>must</em> contain one .csv or .json file with metadata. -{" "}
             <a
-              download
               className="text-link-foreground hover:text-foreground"
+              download
               href="/assets/examples/example.csv"
             >
               Download example.csv
             </a>
             .{" "}
             <a
-              download
               className="text-link-foreground hover:text-foreground"
+              download
               href="/assets/examples/example.json"
             >
               Download example.json
@@ -111,8 +111,8 @@ export const UploadStep: React.FC<UploadStepProps> = ({
             <InlineCode code="animation_url" /> column and add the IPFS hashes
             there.{" "}
             <a
-              download
               className="text-link-foreground hover:text-foreground"
+              download
               href="/assets/examples/example-with-ipfs.csv"
             >
               Download example.csv
@@ -123,8 +123,8 @@ export const UploadStep: React.FC<UploadStepProps> = ({
             the name of your files to the <InlineCode code="image" /> and
             <InlineCode code="animation_url" /> column.{" "}
             <a
-              download
               className="text-link-foreground hover:text-foreground"
+              download
               href="/assets/examples/example-with-maps.csv"
             >
               Download example.csv

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

@@ -1,7 +1,11 @@
 "use client";
+import { CircleXIcon, ExternalLinkIcon } from "lucide-react";
+import Link from "next/link";
+import { useState, useTransition } from "react";
+import { toast } from "sonner";
 import type { Team } from "@/api/team";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
 import {
   Sheet,
   SheetContent,
@@ -9,16 +13,12 @@ import {
   SheetTitle,
   SheetTrigger,
 } from "@/components/ui/sheet";
+import { PRO_CONTACT_US_URL } from "@/constants/pro";
+import { useStripeRedirectEvent } from "@/hooks/stripe/redirect-event";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { CircleXIcon, ExternalLinkIcon } from "lucide-react";
-import Link from "next/link";
-import { useState, useTransition } from "react";
-import { toast } from "sonner";
-import { useStripeRedirectEvent } from "../../../../../app/(app)/(stripe)/stripe-redirect/stripeRedirectChannel";
-import { buildCancelPlanUrl } from "../../../../../app/(app)/(stripe)/utils/build-url";
-import { PRO_CONTACT_US_URL } from "../../../../../constants/pro";
-import { pollWithTimeout } from "../../../../../utils/pollWithTimeout";
-import { tryCatch } from "../../../../../utils/try-catch";
+import { pollWithTimeout } from "@/utils/pollWithTimeout";
+import { buildCancelPlanUrl } from "@/utils/stripe/build-url";
+import { tryCatch } from "@/utils/try-catch";
 
 export function CancelPlanButton(props: {
   teamId: string;
@@ -26,13 +26,15 @@ export function CancelPlanButton(props: {
   currentPlan: Team["billingPlan"];
   billingStatus: Team["billingStatus"];
   getTeam: () => Promise<Team>;
+  disabled?: boolean;
 }) {
   // shortcut the sheet in case the user is in the default state
   if (props.billingStatus !== "invalidPayment" && props.currentPlan !== "pro") {
     return (
       <ImmediateCancelPlanButton
-        teamId={props.teamId}
+        disabled={props.disabled}
         getTeam={props.getTeam}
+        teamId={props.teamId}
       />
     );
   }
@@ -40,7 +42,12 @@ export function CancelPlanButton(props: {
   return (
     <Sheet>
       <SheetTrigger asChild>
-        <Button variant="outline" size="sm" className="gap-2 bg-background">
+        <Button
+          className="gap-2 bg-background"
+          disabled={props.disabled}
+          size="sm"
+          variant="outline"
+        >
           <CircleXIcon className="size-4 text-muted-foreground" />
           Cancel Plan
         </Button>
@@ -73,9 +80,10 @@ function UnpaidInvoicesWarning({ teamSlug }: { teamSlug: string }) {
         You have unpaid invoices. Please pay them before cancelling your plan.
       </p>
 
-      <Button variant="outline" asChild className="w-full gap-2 bg-card">
+      <Button asChild className="w-full gap-2 bg-card" variant="outline">
         <Link
-          href={`/team/${teamSlug}/~/settings/invoices?status=open`}
+          href={`/team/${teamSlug}/~/billing/invoices?status=open`}
+          rel="noopener noreferrer"
           target="_blank"
         >
           See Invoices
@@ -95,7 +103,7 @@ function ProPlanCancelPlanSheetContent() {
         Please contact us to cancel your Pro plan
       </p>
 
-      <Button variant="outline" asChild className="w-full gap-2 bg-card">
+      <Button asChild className="w-full gap-2 bg-card" variant="outline">
         <Link href={PRO_CONTACT_US_URL} target="_blank">
           Contact Us <ExternalLinkIcon className="size-4" />
         </Link>
@@ -107,6 +115,7 @@ function ProPlanCancelPlanSheetContent() {
 function ImmediateCancelPlanButton(props: {
   teamId: string;
   getTeam: () => Promise<Team>;
+  disabled?: boolean;
 }) {
   const router = useDashboardRouter();
   const [isRoutePending, startTransition] = useTransition();
@@ -141,11 +150,11 @@ function ImmediateCancelPlanButton(props: {
 
   return (
     <Button
-      variant="outline"
-      size="sm"
-      className="gap-2 bg-background"
-      disabled={showPlanSpinner}
       asChild
+      className="gap-2 bg-background"
+      disabled={showPlanSpinner || props.disabled}
+      size="sm"
+      variant="outline"
     >
       <Link href={buildCancelPlanUrl({ teamId: props.teamId })} target="_blank">
         {showPlanSpinner ? (

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

@@ -0,0 +1,85 @@
+import { formatDistance } from "date-fns";
+import Image from "next/image";
+import type { BillingCredit } from "@/hooks/useApi";
+import { formatToDollars } from "./formatToDollars";
+
+interface CreditsItemProps {
+  credit?: BillingCredit;
+}
+
+export const CreditsItem: React.FC<CreditsItemProps> = ({ credit }) => {
+  const isTwCredit = credit?.name.startsWith("TW -");
+  const isStartupCredit = credit?.name.startsWith("SU -");
+
+  let creditTitle = credit?.name ?? "thirdweb credits";
+  if (isTwCredit) {
+    creditTitle = "thirdweb credits";
+  } else if (isStartupCredit) {
+    creditTitle = "Startup grant credits";
+  }
+
+  return (
+    <div className="rounded-lg border border-border bg-card">
+      <div className="flex flex-col gap-3 p-4 lg:p-6">
+        <div className="relative">
+          <div className="absolute top-0 right-0">
+            {isTwCredit ? (
+              <Image
+                alt="tw-credit"
+                className="size-6"
+                objectFit="contain"
+                src={require("../../../../public/brand/thirdweb-icon.svg")}
+              />
+            ) : isStartupCredit ? (
+              <Image
+                alt="tw-credit"
+                className="size-6"
+                objectFit="contain"
+                src={require("../../../../public/brand/thirdweb-icon.svg")}
+              />
+            ) : null}
+          </div>
+
+          <h3 className="font-semibold text-foreground text-xl tracking-tight">
+            {creditTitle}
+          </h3>
+        </div>
+
+        <div className="flex gap-6">
+          <div>
+            <h4 className="mb-0.5 text-muted-foreground text-sm">
+              Remaining Credits
+            </h4>
+            <p className="text-foreground">
+              {formatToDollars(credit?.remainingValueUsdCents || 0)}
+            </p>
+          </div>
+
+          {!isTwCredit && (
+            <div>
+              <h4 className="mb-0.5 text-muted-foreground text-sm">
+                Claimed Credits (All-Time)
+              </h4>
+              <p className="text-foreground">
+                {formatToDollars(credit?.originalGrantUsdCents || 0)}
+              </p>
+            </div>
+          )}
+
+          {credit?.expiresAt && (
+            <div>
+              <h4 className="mb-0.5 text-muted-foreground text-sm">Expires</h4>
+              <p className="text-foreground">
+                {credit?.expiresAt
+                  ? formatDistance(new Date(credit.expiresAt), Date.now(), {
+                      addSuffix: true,
+                    })
+                  : "N/A"}
+              </p>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+};

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

@@ -0,0 +1,28 @@
+"use client";
+
+// TODO - convert to RSC
+
+import { useAccountCredits } from "@/hooks/useApi";
+import { CreditsItem } from "./CreditsItem";
+
+export const CreditsInfoCard = () => {
+  const { data: credits } = useAccountCredits();
+
+  if (!credits) {
+    return null;
+  }
+
+  const restCredits = credits.filter((crd) => !crd.name.startsWith("OP -"));
+
+  if (restCredits.length === 0) {
+    return null;
+  }
+
+  return (
+    <section className="flex flex-col gap-4">
+      {restCredits.map((credit) => (
+        <CreditsItem credit={credit} key={credit.couponId} />
+      ))}
+    </section>
+  );
+};

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

@@ -1,28 +1,23 @@
 "use client";
 
+import { useTransition } from "react";
 import type { Team } from "@/api/team";
 import { PricingCard } from "@/components/blocks/pricing-card";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
+import { PRO_CONTACT_US_URL } from "@/constants/pro";
+import { useStripeRedirectEvent } from "@/hooks/stripe/redirect-event";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { CheckIcon } from "lucide-react";
-import Link from "next/link";
-import { useTransition } from "react";
-
-import { useStripeRedirectEvent } from "../../../../app/(app)/(stripe)/stripe-redirect/stripeRedirectChannel";
-import { getValidTeamPlan } from "../../../../app/(app)/team/components/TeamHeader/getValidTeamPlan";
-import { PRO_CONTACT_US_URL } from "../../../../constants/pro";
+import { getValidTeamPlan } from "@/utils/getValidTeamPlan";
 
 // this is used to determine whether to show "Upgrade" or "Downgrade" label based on tier level
 const planToTierRecord: Record<Team["billingPlan"], number> = {
-  free: 0,
-  starter_legacy: 1,
-  starter: 2,
-  growth_legacy: 3,
-  growth: 4,
   accelerate: 5,
-  scale: 6,
+  free: 0,
+  growth: 4,
+  growth_legacy: 3,
   pro: 7,
+  scale: 6,
+  starter: 2,
 };
 
 interface BillingPricingProps {
@@ -74,21 +69,17 @@ export const BillingPricing: React.FC<BillingPricingProps> = ({
         validTeamPlan === "starter" ||
         validTeamPlan === "growth_legacy"));
 
-  const highlightStarterPlan =
-    highlightPlan === "starter" ||
-    (!highlightPlan &&
-      !isCurrentPlanScheduledToCancel &&
-      validTeamPlan === "starter_legacy");
-  const highlightAcceleratePlan =
-    highlightPlan === "accelerate" ||
-    (!highlightPlan &&
-      !isCurrentPlanScheduledToCancel &&
-      validTeamPlan === "growth");
+  const highlightStarterPlan = highlightPlan === "starter";
   const highlightScalePlan =
     highlightPlan === "scale" ||
     (!highlightPlan &&
       !isCurrentPlanScheduledToCancel &&
-      validTeamPlan === "accelerate");
+      (validTeamPlan === "accelerate" || validTeamPlan === "growth"));
+  const highlightProPlan =
+    highlightPlan === "pro" ||
+    (!highlightPlan &&
+      !isCurrentPlanScheduledToCancel &&
+      validTeamPlan === "pro");
 
   return (
     <div>
@@ -108,123 +99,79 @@ export const BillingPricing: React.FC<BillingPricingProps> = ({
         <PricingCard
           billingPlan="starter"
           billingStatus={team.billingStatus}
-          current={validTeamPlan === "starter"}
           cta={getPlanCta(
             validTeamPlan,
             "starter",
             isCurrentPlanScheduledToCancel,
           )}
-          teamSlug={team.slug}
-          teamId={team.id}
-          highlighted={highlightStarterPlan}
+          current={validTeamPlan === "starter"}
           getTeam={getTeam}
+          highlighted={highlightStarterPlan}
+          teamId={team.id}
+          teamSlug={team.slug}
         />
 
         {/* Growth */}
         <PricingCard
-          billingPlan="growth"
-          billingStatus={team.billingStatus}
           activeTrialEndsAt={
             validTeamPlan === "growth" ? trialPeriodEndedAt : undefined
           }
-          current={validTeamPlan === "growth"}
+          billingPlan="growth"
+          billingStatus={team.billingStatus}
           cta={getPlanCta(
             validTeamPlan,
             "growth",
             isCurrentPlanScheduledToCancel,
           )}
+          current={validTeamPlan === "growth"}
+          getTeam={getTeam}
           highlighted={highlightGrowthPlan}
-          teamSlug={team.slug}
           teamId={team.id}
-          getTeam={getTeam}
-        />
-
-        {/* Accelerate */}
-        <PricingCard
-          billingPlan="accelerate"
-          billingStatus={team.billingStatus}
           teamSlug={team.slug}
-          teamId={team.id}
-          current={validTeamPlan === "accelerate"}
-          cta={getPlanCta(
-            validTeamPlan,
-            "accelerate",
-            isCurrentPlanScheduledToCancel,
-          )}
-          highlighted={highlightAcceleratePlan}
-          getTeam={getTeam}
         />
 
         {/* Scale */}
         <PricingCard
           billingPlan="scale"
           billingStatus={team.billingStatus}
-          teamSlug={team.slug}
-          teamId={team.id}
-          current={validTeamPlan === "scale"}
           cta={getPlanCta(
             validTeamPlan,
             "scale",
             isCurrentPlanScheduledToCancel,
           )}
-          highlighted={highlightScalePlan}
+          current={validTeamPlan === "scale"}
           getTeam={getTeam}
+          highlighted={highlightScalePlan}
+          teamId={team.id}
+          teamSlug={team.slug}
+        />
+
+        {/* Pro */}
+        <PricingCard
+          billingPlan="pro"
+          billingStatus={team.billingStatus}
+          cta={getPlanCta(validTeamPlan, "pro", isCurrentPlanScheduledToCancel)}
+          current={validTeamPlan === "pro"}
+          getTeam={getTeam}
+          highlighted={highlightProPlan}
+          teamId={team.id}
+          teamSlug={team.slug}
         />
       </div>
-      <div className="h-8" />
-      <ProCard />
     </div>
   );
 };
 
-const proFeatures = [
-  "Custom rate limits for APIs & Infra",
-  "Guaranteed support response time",
-  "Direct access to solutions & engineering teams",
-  "Enterprise grade SLAs",
-];
-
-function ProCard() {
-  return (
-    <div className="flex flex-col justify-between gap-6 rounded-lg border bg-card p-6 lg:flex-row">
-      <div>
-        <h2 className="mb-0.5 font-semibold text-xl tracking-tight">
-          Need more? Upgrade to Pro
-        </h2>
-        <p className="text-muted-foreground text-sm">
-          Ideal for teams that require more customization, SLAs, and support.
-        </p>
-
-        <ul className="mt-5 grid max-w-3xl grid-cols-1 gap-x-8 gap-y-2 text-muted-foreground text-sm lg:grid-cols-2">
-          {proFeatures.map((feature, i) => (
-            // biome-ignore lint/suspicious/noArrayIndexKey: <explanation>
-            <li key={i} className="flex items-center gap-2">
-              <CheckIcon className="size-4 text-success-text" />
-              {feature}
-            </li>
-          ))}
-        </ul>
-      </div>
-
-      <Button variant="outline" asChild className="gap-2 bg-background">
-        <Link href={PRO_CONTACT_US_URL} target="_blank">
-          Contact Us
-        </Link>
-      </Button>
-    </div>
-  );
-}
-
 function getPlanCta(
   currentPlan: Team["billingPlan"],
   targetPlan: Team["billingPlan"],
   isScheduledToCancel: boolean,
 ): CtaLink | undefined {
-  // if any of the plan is pro - show contact us
-  if (currentPlan === "pro" || targetPlan === "pro") {
+  // if the CURRENT plan is pro, show contact us link
+  if (currentPlan === "pro") {
     return {
-      label: "Contact us",
       href: PRO_CONTACT_US_URL,
+      label: "Contact us",
       type: "link",
     };
   }

apps/dashboard/src/@/components/billing/SubscriptionCoupons/Coupons.stories.tsx

@@ -1,13 +1,13 @@
+import type { Meta, StoryObj } from "@storybook/nextjs";
+import { useId, useMemo, useState } from "react";
 import { Label } from "@/components/ui/label";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 import { Switch } from "@/components/ui/switch";
-import type { Meta, StoryObj } from "@storybook/react";
-import { useMemo, useState } from "react";
 import { type CouponData, CouponsUI } from "./CouponsUI";
 
 const meta = {
-  title: "Billing/Coupons",
   component: Story,
+  title: "Billing/Coupons",
 } satisfies Meta<typeof CouponsUI>;
 
 export default meta;
@@ -16,54 +16,54 @@ type Story = StoryObj<typeof CouponsUI>;
 const couponStubs: CouponData[] = [
   // Forever
   {
-    id: "di_1QAE7jCQUO4TBFqFQgnS4Qj4",
-    start: 1729011691,
-    end: null,
     coupon: {
-      id: "forever_active",
-      name: "Example 1",
       duration: "forever",
       duration_in_months: null,
+      id: "forever_active",
+      name: "Example 1",
     },
+    end: null,
+    id: "di_1QAE7jCQUO4TBFqFQgnS4Qj4",
+    start: 1729011691,
   },
 
   // Once
   {
-    id: "once",
-    start: 1733391052,
-    end: null,
     coupon: {
-      id: "once_active",
-      name: "Example 2",
       duration: "once",
       duration_in_months: null,
+      id: "once_active",
+      name: "Example 2",
     },
+    end: null,
+    id: "once",
+    start: 1733391052,
   },
 
   // Repeating - 3 months
   {
-    id: "repeating-3",
-    start: 1733391629,
-    end: 1743391629, // Will end in the future
     coupon: {
-      id: "repeating_active",
-      name: "Example 3",
       duration: "repeating",
       duration_in_months: 3,
+      id: "repeating_active",
+      name: "Example 3",
     },
+    end: 1743391629,
+    id: "repeating-3", // Will end in the future
+    start: 1733391629,
   },
 
   // Repeating - 1 month
   {
-    id: "repeating-1",
-    start: 1733391713,
-    end: 1736391713,
     coupon: {
-      id: "repeating_single",
-      name: "Example 4",
       duration: "repeating",
       duration_in_months: 1,
+      id: "repeating_single",
+      name: "Example 4",
     },
+    end: 1736391713,
+    id: "repeating-1",
+    start: 1733391713,
   },
 ];
 
@@ -102,6 +102,9 @@ function Story() {
     200 | 400 | 401 | 409 | 429 | 500
   >(200);
 
+  const hasAccountCouponId = useId();
+  const paymentSetupId = useId();
+
   return (
     <div className="container max-w-[1100px] py-10">
       <div className="mb-8 space-y-6">
@@ -109,22 +112,22 @@ function Story() {
           <div className="space-y-3">
             <h3 className="font-semibold text-lg">Status</h3>
             <RadioGroup
-              value={status}
+              className="flex gap-4"
               onValueChange={(value) =>
                 setStatus(value as "pending" | "error" | "success")
               }
-              className="flex gap-4"
+              value={status}
             >
               <div className="flex items-center space-x-2">
-                <RadioGroupItem value="pending" id="status-pending" />
+                <RadioGroupItem value="pending" />
                 <Label htmlFor="status-pending">Pending</Label>
               </div>
               <div className="flex items-center space-x-2">
-                <RadioGroupItem value="error" id="status-error" />
+                <RadioGroupItem value="error" />
                 <Label htmlFor="status-error">Error</Label>
               </div>
               <div className="flex items-center space-x-2">
-                <RadioGroupItem value="success" id="status-success" />
+                <RadioGroupItem value="success" />
                 <Label htmlFor="status-success">Success</Label>
               </div>
             </RadioGroup>
@@ -133,22 +136,22 @@ function Story() {
           <div className="space-y-3">
             <h3 className="font-semibold text-lg">Active Coupons</h3>
             <RadioGroup
-              value={activeCouponsType}
+              className="flex gap-4"
               onValueChange={(value) =>
                 setActiveCouponsType(value as "multiple" | "zero" | "one")
               }
-              className="flex gap-4"
+              value={activeCouponsType}
             >
               <div className="flex items-center space-x-2">
-                <RadioGroupItem value="multiple" id="coupons-multiple" />
+                <RadioGroupItem value="multiple" />
                 <Label htmlFor="coupons-multiple">Multiple</Label>
               </div>
               <div className="flex items-center space-x-2">
-                <RadioGroupItem value="zero" id="coupons-zero" />
+                <RadioGroupItem value="zero" />
                 <Label htmlFor="coupons-zero">Zero</Label>
               </div>
               <div className="flex items-center space-x-2">
-                <RadioGroupItem value="one" id="coupons-one" />
+                <RadioGroupItem value="one" />
                 <Label htmlFor="coupons-one">One</Label>
               </div>
             </RadioGroup>
@@ -157,19 +160,19 @@ function Story() {
           <div className="space-y-3">
             <h3 className="font-semibold text-lg">Apply Coupon Status</h3>
             <RadioGroup
-              value={applyCouponStatus.toString()}
               className="flex gap-4"
               onValueChange={(value) =>
                 setApplyCouponStatus(
                   Number.parseInt(value) as 200 | 400 | 401 | 409 | 429 | 500,
                 )
               }
+              value={applyCouponStatus.toString()}
             >
               {[200, 400, 401, 409, 429, 500].map((code) => (
-                <div key={code} className="flex items-center space-x-2">
+                <div className="flex items-center space-x-2" key={code}>
                   <RadioGroupItem
-                    value={code.toString()}
                     id={`status-${code}`}
+                    value={code.toString()}
                   />
                   <Label htmlFor={`status-${code}`}>{code}</Label>
                 </div>
@@ -183,52 +186,52 @@ function Story() {
           <div className="space-y-4">
             <div className="flex items-center gap-4">
               <Switch
-                id="has-account-coupon"
                 checked={hasAccountCoupon}
+                id={hasAccountCouponId}
                 onCheckedChange={setHasAccountCoupon}
               />
-              <Label htmlFor="has-account-coupon">Has Account Coupon</Label>
+              <Label htmlFor={hasAccountCouponId}>Has Account Coupon</Label>
             </div>
             <div className="flex items-center gap-4">
               <Switch
-                id="payment-setup"
                 checked={isPaymentSetup}
+                id={paymentSetupId}
                 onCheckedChange={setIsPaymentSetup}
               />
-              <Label htmlFor="payment-setup">Payment Setup</Label>
+              <Label htmlFor={paymentSetupId}>Payment Setup</Label>
             </div>
           </div>
         </div>
       </div>
 
       <CouponsUI
-        status={status}
-        activeCoupons={activeCoupons}
         accountCouponId={hasAccountCoupon ? activeCoupons[0]?.id : undefined}
-        isPaymentSetup={isPaymentSetup}
+        activeCoupons={activeCoupons}
         applyCoupon={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
           return {
-            status: applyCouponStatus,
             data:
               applyCouponStatus === 200
                 ? {
-                    id: "xyz",
-                    start: 1727992716,
-                    end: 1759528716,
                     coupon: {
-                      id: "test",
-                      name: "TEST COUPON",
                       duration: "repeating",
                       duration_in_months: 12,
+                      id: "test",
+                      name: "TEST COUPON",
                     },
+                    end: 1759528716,
+                    id: "xyz",
+                    start: 1727992716,
                   }
                 : null,
+            status: applyCouponStatus,
           };
         }}
         deleteCoupon={async () => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         }}
+        isPaymentSetup={isPaymentSetup}
+        status={status}
       />
     </div>
   );

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

@@ -1,6 +1,6 @@
-import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { Suspense } from "react";
-import { getAuthToken } from "../../../../../app/(app)/api/lib/getAuthToken";
+import { getAuthToken } from "@/api/auth-token";
+import { NEXT_PUBLIC_THIRDWEB_API_HOST } from "@/constants/public-envs";
 import { CouponsClient } from "./CouponsClient";
 import type { CouponData } from "./CouponsUI";
 
@@ -39,10 +39,10 @@ async function AsyncCoupons(props: {
   ) {
     return (
       <CouponsClient
-        status="error"
-        activeCoupons={[]}
         accountCouponId={undefined}
+        activeCoupons={[]}
         isPaymentSetup={props.isPaymentSetup}
+        status="error"
         teamId={props.teamId}
       />
     );
@@ -58,34 +58,31 @@ async function AsyncCoupons(props: {
 
   return (
     <CouponsClient
-      status="success"
-      activeCoupons={allCouponsData.data}
       accountCouponId={accountCouponData.data?.id}
+      activeCoupons={allCouponsData.data}
       isPaymentSetup={props.isPaymentSetup}
+      status="success"
       teamId={props.teamId}
     />
   );
 }
 
-export function Coupons(props: {
-  teamId: string;
-  isPaymentSetup: boolean;
-}) {
+export function Coupons(props: { teamId: string; isPaymentSetup: boolean }) {
   return (
     <Suspense
       fallback={
         <CouponsClient
-          status="pending"
-          activeCoupons={[]}
           accountCouponId={undefined}
+          activeCoupons={[]}
           isPaymentSetup={true}
+          status="pending"
           teamId={props.teamId}
         />
       }
     >
       <AsyncCoupons
-        teamId={props.teamId}
         isPaymentSetup={props.isPaymentSetup}
+        teamId={props.teamId}
       />
     </Suspense>
   );

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

@@ -16,6 +16,35 @@ export function CouponsClient(
   return (
     <CouponsUI
       {...props}
+      applyCoupon={async (promoCode: string) => {
+        const res = await apiServerProxy<{ data: CouponData }>({
+          body: JSON.stringify({
+            promoCode,
+            teamId: props.teamId,
+          }),
+          headers: {
+            "Content-Type": "application/json",
+          },
+          method: "POST",
+          pathname: "/v1/coupons/redeem",
+        });
+
+        if (!res.ok) {
+          return {
+            data: null,
+            status: res.status,
+          };
+        }
+
+        const json = res.data;
+
+        router.refresh();
+
+        return {
+          data: json.data,
+          status: 200,
+        };
+      }}
       deleteCoupon={async () => {
         const res = await apiServerProxy({
           method: "DELETE",
@@ -29,35 +58,6 @@ export function CouponsClient(
 
         router.refresh();
       }}
-      applyCoupon={async (promoCode: string) => {
-        const res = await apiServerProxy<{ data: CouponData }>({
-          method: "POST",
-          pathname: "/v1/coupons/redeem",
-          headers: {
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({
-            promoCode,
-            teamId: props.teamId,
-          }),
-        });
-
-        if (!res.ok) {
-          return {
-            status: res.status,
-            data: null,
-          };
-        }
-
-        const json = res.data;
-
-        router.refresh();
-
-        return {
-          status: 200,
-          data: json.data,
-        };
-      }}
     />
   );
 }

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

@@ -1,17 +1,5 @@
 "use client";
 
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableContainer,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from "@/components/ui/table";
-import { ToolTipLabel } from "@/components/ui/tooltip";
 import { useMutation } from "@tanstack/react-query";
 import { format, fromUnixTime } from "date-fns";
 import {
@@ -22,6 +10,18 @@ import {
   Trash2Icon,
 } from "lucide-react";
 import { toast } from "sonner";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableContainer,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from "@/components/ui/table";
+import { ToolTipLabel } from "@/components/ui/tooltip";
 
 type Coupon = {
   id: string;
@@ -211,17 +211,17 @@ function DeleteCouponButton(props: {
 
   return (
     <Button
-      variant="outline"
-      size="sm"
+      aria-label="Remove coupon"
       disabled={props.disabled}
       onClick={() => {
         const promise = deleteCoupon.mutateAsync();
         toast.promise(promise, {
-          success: "Coupon removed successfully",
           error: "Failed to remove coupon",
+          success: "Coupon removed successfully",
         });
       }}
-      aria-label="Remove coupon"
+      size="sm"
+      variant="outline"
     >
       {deleteCoupon.isPending ? (
         <Spinner className="size-4" />

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

@@ -1,14 +1,14 @@
 "use client";
 import { AlertTriangleIcon } from "lucide-react";
 import Link from "next/link";
+import type { Team } from "@/api/team";
+import { Button, type ButtonProps } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
+import type { ProductSKU } from "@/types/billing";
 import {
   buildBillingPortalUrl,
   buildCheckoutUrl,
-} from "../../app/(app)/(stripe)/utils/build-url";
-import type { Team } from "../api/team";
-import type { ProductSKU } from "../lib/billing";
-import { cn } from "../lib/utils";
-import { Button, type ButtonProps } from "./ui/button";
+} from "@/utils/stripe/build-url";
 
 export function CheckoutButton(props: {
   buttonProps?: Omit<ButtonProps, "children">;
@@ -38,11 +38,12 @@ export function CheckoutButton(props: {
         }}
       >
         <Link
-          target="_blank"
           href={buildCheckoutUrl({
-            teamSlug: props.teamSlug,
             sku: props.sku,
+            teamSlug: props.teamSlug,
           })}
+          rel="noopener noreferrer"
+          target="_blank"
         >
           {props.children}
         </Link>
@@ -58,8 +59,8 @@ function BillingWarning({ teamSlug }: { teamSlug: string }) {
       <p className="text-sm">
         You have outstanding invoices. Please{" "}
         <Link
-          href={`/team/${teamSlug}/~/settings/invoices?status=open`}
           className="font-medium text-amber-700 underline transition-colors hover:text-amber-900 dark:text-amber-400 dark:hover:text-amber-300"
+          href={`/team/${teamSlug}/~/billing/invoices?status=open`}
         >
           pay them
         </Link>{" "}
@@ -77,19 +78,20 @@ export function BillingPortalButton(props: {
   return (
     <Button
       {...props.buttonProps}
+      asChild
       className={cn(props.buttonProps?.className, "gap-2")}
       disabled={props.buttonProps?.disabled}
-      asChild
       onClick={async (e) => {
         props.buttonProps?.onClick?.(e);
       }}
     >
-      <Link
+      <a
         href={buildBillingPortalUrl({ teamSlug: props.teamSlug })}
+        rel="noopener noreferrer"
         target="_blank"
       >
         {props.children}
-      </Link>
+      </a>
     </Button>
   );
 }

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

@@ -1,7 +1,7 @@
 export const formatToDollars = (cents: number) => {
   const dollars = cents / 100;
   return new Intl.NumberFormat(undefined, {
-    style: "currency",
     currency: "USD",
+    style: "currency",
   }).format(dollars);
 };

apps/dashboard/src/@/components/billing/renew-subscription/renew-subscription-button.tsx

@@ -1,20 +1,21 @@
 "use client";
 
-import { reSubscribePlan } from "@/actions/billing";
-import type { Team } from "@/api/team";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Button } from "@/components/ui/button";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
 import { useMutation } from "@tanstack/react-query";
 import { RefreshCwIcon } from "lucide-react";
 import { useState, useTransition } from "react";
 import { toast } from "sonner";
-import { pollWithTimeout } from "../../../../../utils/pollWithTimeout";
-import { tryCatch } from "../../../../../utils/try-catch";
+import { reSubscribePlan } from "@/actions/billing";
+import type { Team } from "@/api/team";
+import { Button } from "@/components/ui/button";
+import { Spinner } from "@/components/ui/Spinner/Spinner";
+import { useDashboardRouter } from "@/lib/DashboardRouter";
+import { pollWithTimeout } from "../../../utils/pollWithTimeout";
+import { tryCatch } from "../../../utils/try-catch";
 
 export function RenewSubscriptionButton(props: {
   teamId: string;
   getTeam: () => Promise<Team>;
+  disabled?: boolean;
 }) {
   const router = useDashboardRouter();
   const [isRoutePending, setTransition] = useTransition();
@@ -67,11 +68,11 @@ export function RenewSubscriptionButton(props: {
 
   return (
     <Button
-      onClick={handleRenewSubscription}
-      variant="default"
-      size="sm"
       className="gap-2"
-      disabled={showSpinner}
+      disabled={showSpinner || props.disabled}
+      onClick={handleRenewSubscription}
+      size="sm"
+      variant="default"
     >
       {showSpinner ? (
         <Spinner className="size-4" />

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

@@ -1,7 +1,9 @@
 /* eslint-disable no-restricted-syntax */
-import { Input } from "@/components/ui/input";
+
 import { PercentIcon } from "lucide-react";
 import { useEffect, useState } from "react";
+import { Input } from "@/components/ui/input";
+import { cn } from "@/lib/utils";
 
 type InputProps = React.ComponentProps<typeof Input>;
 
@@ -44,10 +46,13 @@ export const BasisPointsInput: React.FC<BasisPointsInputProps> = ({
   return (
     <div className="flex overflow-hidden rounded-lg border border-border ring-offset-background focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2">
       <Input
-        className="rounded-r-none border-none focus-visible:ring-0 focus-visible:ring-offset-0"
         value={stringValue}
         {...restInputProps}
-        onChange={(e) => setStringValue(e.target.value)}
+        className={cn(
+          "rounded-r-none border-none focus-visible:ring-0 focus-visible:ring-offset-0",
+          restInputProps.className,
+        )}
+        maxLength={5}
         onBlur={(e) => {
           const val = e.target.value;
           const validValue = val.match(
@@ -59,7 +64,7 @@ export const BasisPointsInput: React.FC<BasisPointsInputProps> = ({
             setStringValue("0.00");
           }
         }}
-        maxLength={5}
+        onChange={(e) => setStringValue(e.target.value)}
       />
       <div className="flex items-center justify-center border-border border-l bg-card px-3 font-medium">
         <PercentIcon className="size-4" />